From patchwork Tue Mar 15 15:03:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 8589531 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2772C9F6E1 for ; Tue, 15 Mar 2016 15:23:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E28472024C for ; Tue, 15 Mar 2016 15:23:57 +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 EB1A32022D for ; Tue, 15 Mar 2016 15:23:51 +0000 (UTC) Received: from localhost ([::1]:49081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afqp5-0007cx-A2 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 15 Mar 2016 11:23:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afqVj-0004Dc-IM for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:03:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afqVd-0007bf-Ay for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:03:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afqVc-0007aW-U0 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:03:45 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 7F65F8E39C; Tue, 15 Mar 2016 15:03:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-46.ams2.redhat.com [10.36.116.46]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2FF3gMV014153 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 15 Mar 2016 11:03:43 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 81D223011F90; Tue, 15 Mar 2016 16:03:41 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2016 16:03:30 +0100 Message-Id: <1458054221-16923-5-git-send-email-armbru@redhat.com> In-Reply-To: <1458054221-16923-1-git-send-email-armbru@redhat.com> References: <1458054221-16923-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 04/15] Clean up includes some more 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 Manually drop redundant includes that scripts/clean-includes misses, e.g. because they're hidden in generator programs, or they use the wrong kind of delimiter. Signed-off-by: Markus Armbruster --- hw/net/vmxnet_rx_pkt.h | 2 -- hw/net/vmxnet_tx_pkt.h | 2 -- hw/scsi/virtio-scsi-dataplane.c | 1 - include/hw/acpi/pcihp.h | 1 - include/qemu/range.h | 1 - qga/main.c | 1 - qga/vss-win32/requester.cpp | 1 - scripts/qapi-types.py | 5 ----- scripts/tracetool/backend/log.py | 6 +----- scripts/tracetool/format/events_h.py | 2 -- scripts/tracetool/format/h.py | 1 - scripts/tracetool/format/tcg_h.py | 2 -- scripts/tracetool/format/ust_events_c.py | 1 - stubs/gdbstub.c | 2 -- stubs/target-get-monitor-def.c | 1 - stubs/target-monitor-defs.c | 1 - tests/tcg/test-i386-fprem.c | 4 +--- util/base64.c | 2 -- 18 files changed, 2 insertions(+), 34 deletions(-) diff --git a/hw/net/vmxnet_rx_pkt.h b/hw/net/vmxnet_rx_pkt.h index a425846..0a45c1b 100644 --- a/hw/net/vmxnet_rx_pkt.h +++ b/hw/net/vmxnet_rx_pkt.h @@ -18,8 +18,6 @@ #ifndef VMXNET_RX_PKT_H #define VMXNET_RX_PKT_H -#include "stdint.h" -#include "stdbool.h" #include "net/eth.h" /* defines to enable packet dump functions */ diff --git a/hw/net/vmxnet_tx_pkt.h b/hw/net/vmxnet_tx_pkt.h index 57121a6..f51e98a 100644 --- a/hw/net/vmxnet_tx_pkt.h +++ b/hw/net/vmxnet_tx_pkt.h @@ -18,8 +18,6 @@ #ifndef VMXNET_TX_PKT_H #define VMXNET_TX_PKT_H -#include "stdint.h" -#include "stdbool.h" #include "net/eth.h" #include "exec/hwaddr.h" diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index 367e476..b44ac5d 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -19,7 +19,6 @@ #include #include #include "hw/virtio/virtio-access.h" -#include "stdio.h" /* Context: QEMU global mutex held */ void virtio_scsi_set_iothread(VirtIOSCSI *s, IOThread *iothread) diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index 31b7820..79a4392 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -27,7 +27,6 @@ #ifndef HW_ACPI_PCIHP_H #define HW_ACPI_PCIHP_H -#include #include "hw/acpi/acpi.h" #include "migration/vmstate.h" diff --git a/include/qemu/range.h b/include/qemu/range.h index 9fc547b..c903eb5 100644 --- a/include/qemu/range.h +++ b/include/qemu/range.h @@ -1,7 +1,6 @@ #ifndef QEMU_RANGE_H #define QEMU_RANGE_H -#include #include "qemu/queue.h" /* diff --git a/qga/main.c b/qga/main.c index 0a168e2..fb2f663 100644 --- a/qga/main.c +++ b/qga/main.c @@ -24,7 +24,6 @@ #include "qapi/qmp/qjson.h" #include "qga/guest-agent-core.h" #include "qemu/module.h" -#include "signal.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/dispatch.h" #include "qga/channel.h" diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp index b57d517..889052d 100644 --- a/qga/vss-win32/requester.cpp +++ b/qga/vss-win32/requester.cpp @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "vss-common.h" #include "requester.h" -#include "assert.h" #include "inc/win2003/vswriter.h" #include "inc/win2003/vsbackup.h" diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 0306a88..2ac8185 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -292,11 +292,6 @@ fdef.write(mcgen(''' ''', prefix=prefix)) -# To avoid circular headers, use only typedefs.h here, not qobject.h -fdecl.write(mcgen(''' -#include "qemu/typedefs.h" -''')) - schema = QAPISchema(input_file) gen = QAPISchemaGenTypeVisitor() schema.visit(gen) diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py index a62c310..e409b73 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -20,11 +20,7 @@ PUBLIC = True def generate_h_begin(events): - out('#include ', - '#include ', - '#include ', - '#include ', - '#include "trace/control.h"', + out('#include "trace/control.h"', '#include "qemu/log.h"', '') diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py index bbfaa5b..4529263 100644 --- a/scripts/tracetool/format/events_h.py +++ b/scripts/tracetool/format/events_h.py @@ -21,8 +21,6 @@ def generate(events, backend): '', '#ifndef TRACE__GENERATED_EVENTS_H', '#define TRACE__GENERATED_EVENTS_H', - '', - '#include ', '') # event identifiers diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 2bd68a2..0835406 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -23,7 +23,6 @@ def generate(events, backend): '#define TRACE__GENERATED_TRACERS_H', '', '#include "qemu-common.h"', - '#include "qemu/typedefs.h"', '') backend.generate_begin(events) diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py index 006eaa8..e2331f2 100644 --- a/scripts/tracetool/format/tcg_h.py +++ b/scripts/tracetool/format/tcg_h.py @@ -34,8 +34,6 @@ def generate(events, backend): '#ifndef TRACE__GENERATED_TCG_TRACERS_H', '#define TRACE__GENERATED_TCG_TRACERS_H', '', - '#include ', - '', '#include "trace.h"', '#include "exec/helper-proto.h"', '', diff --git a/scripts/tracetool/format/ust_events_c.py b/scripts/tracetool/format/ust_events_c.py index bf0b334..9967c7a 100644 --- a/scripts/tracetool/format/ust_events_c.py +++ b/scripts/tracetool/format/ust_events_c.py @@ -32,5 +32,4 @@ def generate(events, backend): ' */', '#pragma GCC diagnostic ignored "-Wredundant-decls"', '', - '#include "qemu/typedefs.h"', '#include "generated-ust-provider.h"') diff --git a/stubs/gdbstub.c b/stubs/gdbstub.c index 359c289..2b7aee5 100644 --- a/stubs/gdbstub.c +++ b/stubs/gdbstub.c @@ -1,6 +1,4 @@ #include "qemu/osdep.h" -#include "stdbool.h" /* bool (in exec/gdbstub.h) */ -#include "stddef.h" /* NULL */ #include "exec/gdbstub.h" /* xml_builtin */ const char *const xml_builtin[][2] = { diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-def.c index dd83052..394e0f9 100644 --- a/stubs/target-get-monitor-def.c +++ b/stubs/target-get-monitor-def.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "stdint.h" int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c index 7a16ad7..ac07b19 100644 --- a/stubs/target-monitor-defs.c +++ b/stubs/target-monitor-defs.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "stddef.h" const MonitorDef *target_monitor_defs(void); diff --git a/tests/tcg/test-i386-fprem.c b/tests/tcg/test-i386-fprem.c index e91fb1a..1a71623 100644 --- a/tests/tcg/test-i386-fprem.c +++ b/tests/tcg/test-i386-fprem.c @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "qemu/compiler.h" + #include "qemu/osdep.h" -#include -#include /* * Inspired by 's union ieee854_long_double, but with single diff --git a/util/base64.c b/util/base64.c index d166ff7..9d3c46c 100644 --- a/util/base64.c +++ b/util/base64.c @@ -19,8 +19,6 @@ */ #include "qemu/osdep.h" -#include - #include "qapi/error.h" #include "qemu/base64.h"