From patchwork Mon Mar 14 18:15:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 8583271 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 548B7C0553 for ; Mon, 14 Mar 2016 18:15:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A26AA2020F for ; Mon, 14 Mar 2016 18:15:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB8EF201FA for ; Mon, 14 Mar 2016 18:15:43 +0000 (UTC) Received: from localhost ([::1]:43233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afX1q-0000Xy-KS for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Mar 2016 14:15:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afX1e-0000Xs-Ns for qemu-devel@nongnu.org; Mon, 14 Mar 2016 14:15:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afX1d-0003lI-CZ for qemu-devel@nongnu.org; Mon, 14 Mar 2016 14:15:30 -0400 Received: from qemu.weilnetz.de ([2a03:4000:2:362::1]:56682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afX1d-0003l0-69 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 14:15:29 -0400 Received: by qemu.weilnetz.de (Postfix, from userid 1000) id 7EC9417F807; Mon, 14 Mar 2016 19:15:24 +0100 (CET) From: Stefan Weil To: QEMU Developer Date: Mon, 14 Mar 2016 19:15:22 +0100 Message-Id: <1457979322-21229-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a03:4000:2:362::1 Cc: Paolo Bonzini , Stefan Weil , Eduardo Habkost , Markus Armbruster , Richard Henderson Subject: [Qemu-devel] [PATCH] Remove unneeded include statements for setjmp.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As soon as setjmp.h is included from qemu/osdep.h, those old include statements are no longer needed. Add also setjmp.h to the list in scripts/clean-includes. Signed-off-by: Stefan Weil --- This patch is based on my previous patch "Include setjmp.h in qemu/osdep.h (bug fix for w64)". disas/i386.c | 2 -- disas/m68k.c | 2 -- include/qom/cpu.h | 1 - scripts/clean-includes | 2 +- util/coroutine-sigaltstack.c | 1 - util/coroutine-ucontext.c | 1 - util/oslib-posix.c | 1 - 7 files changed, 1 insertion(+), 9 deletions(-) diff --git a/disas/i386.c b/disas/i386.c index d40b72a..394ffe1 100644 --- a/disas/i386.c +++ b/disas/i386.c @@ -153,8 +153,6 @@ /* opcodes/i386-dis.c r1.126 */ #include "qemu-common.h" -#include - static int fetch_data2(struct disassemble_info *, bfd_byte *); static int fetch_data(struct disassemble_info *, bfd_byte *); static void ckprefix (void); diff --git a/disas/m68k.c b/disas/m68k.c index 0412ecd..8f74ae1 100644 --- a/disas/m68k.c +++ b/disas/m68k.c @@ -615,8 +615,6 @@ static const char *const reg_half_names[] = /* Maximum length of an instruction. */ #define MAXLEN 22 -#include - struct private { /* Points to first byte not fetched. */ diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 7052eee..4a6def7 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -20,7 +20,6 @@ #ifndef QEMU_CPU_H #define QEMU_CPU_H -#include #include "hw/qdev-core.h" #include "disas/bfd.h" #include "exec/hwaddr.h" diff --git a/scripts/clean-includes b/scripts/clean-includes index a1faa60..3caccde 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -141,7 +141,7 @@ for f in "$@"; do perl -n -i -e 'print if !/\s*#\s*include\s*(["<][^>"]*[">])/ || ! (grep { $_ eq $1 } qw ( "config-host.h" "qemu/compiler.h" "config.h" - + diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c index 6b8aee7..a7c3366 100644 --- a/util/coroutine-sigaltstack.c +++ b/util/coroutine-sigaltstack.c @@ -26,7 +26,6 @@ #undef _FORTIFY_SOURCE #endif #include "qemu/osdep.h" -#include #include #include "qemu-common.h" #include "qemu/coroutine_int.h" diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c index 4914f60..2bb7e10 100644 --- a/util/coroutine-ucontext.c +++ b/util/coroutine-ucontext.c @@ -23,7 +23,6 @@ #undef _FORTIFY_SOURCE #endif #include "qemu/osdep.h" -#include #include #include "qemu-common.h" #include "qemu/coroutine_int.h" diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 7615be4..05c44ed 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -49,7 +49,6 @@ #include "qemu/sockets.h" #include #include -#include #include #ifdef CONFIG_LINUX