clean-up: removed duplicate #includes

Some files contain multiple #includes of the same header file. Removed most of those unnecessary duplicate entries using scripts/clean-includes. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Anand J <anand.indukala@gmail.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2016-10-21 12:27:07 +05:30 · 2016-10-21 12:27:07 +05:30 · 814bb12a56
parent d66253e46a
commit 814bb12a56
28 changed files with 0 additions and 36 deletions
--- a/accel.c
+++ b/accel.c
@ -33,7 +33,6 @@
 #include "sysemu/qtest.h"
 #include "hw/xen/xen.h"
 #include "qom/object.h"
-#include "hw/boards.h"

 int tcg_tb_size;
 static bool tcg_allowed = true;
--- a/cputlb.c
+++ b/cputlb.c
@ -26,7 +26,6 @@
 #include "exec/cputlb.h"
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg.h"
 #include "qemu/error-report.h"
 #include "exec/log.h"
--- a/gdbstub.c
+++ b/gdbstub.c
@ -31,7 +31,6 @@

 #define MAX_PACKET_LENGTH 4096

-#include "cpu.h"
 #include "qemu/sockets.h"
 #include "sysemu/kvm.h"
 #include "exec/semihost.h"
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@ -53,7 +53,6 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci-host/q35.h"
 #include "hw/i386/x86-iommu.h"
-#include "hw/timer/hpet.h"

 #include "hw/acpi/aml-build.h"

--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@ -30,7 +30,6 @@
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
-#include "qemu-common.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 #include "hw/loader.h"
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@ -47,7 +47,6 @@
 #include "elf.h"
 #include "hw/timer/mc146818rtc.h"
 #include "hw/timer/i8254.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "hw/sysbus.h"             /* SysBusDevice */
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@ -29,7 +29,6 @@
 #include "hw/isa/isa.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/sysbus.h"
-#include "hw/boards.h"
 #include "trace.h"
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@ -15,7 +15,6 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
-#include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/i386/pc.h"
 #include "qemu/range.h"
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@ -37,7 +37,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "hw/loader.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"

--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@ -37,7 +37,6 @@
 #include "sysemu/block-backend.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"
-#include "sysemu/device_tree.h"
 #include "kvm_ppc.h"
 #include "migration/migration.h"
 #include "mmu-hash64.h"
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@ -26,7 +26,6 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
-#include "qemu/timer.h"
 #include "qemu/main-loop.h"

 #include "trace.h"
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@ -34,7 +34,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
-#include "sysemu/tpm_backend.h"

 #define DEBUG_TIS 0

--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@ -13,7 +13,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@ -17,7 +17,6 @@
 #include <sys/statvfs.h>
 #ifdef CONFIG_INOTIFY1
 #include <sys/inotify.h>
-#include "qapi/error.h"
 #include "qemu/main-loop.h"
 #endif

--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@ -13,7 +13,6 @@
 #include "qemu/bitmap.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"
-#include "hw/boards.h"
 #include "hw/compat.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/mem/nvdimm.h"
--- a/monitor.c
+++ b/monitor.c
@ -59,7 +59,6 @@
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"
 #include "qom/object_interfaces.h"
-#include "cpu.h"
 #include "trace.h"
 #include "trace/control.h"
 #include "monitor/hmp-target.h"
@ -76,7 +75,6 @@
 #include "qapi/qmp-event.h"
 #include "qapi-event.h"
 #include "qmp-introspect.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/qtest.h"
 #include "qemu/cutils.h"
 #include "qapi/qmp/dispatch.h"
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@ -18,7 +18,6 @@
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/timer.h"
-#include "sysemu/block-backend.h"
 #include "qemu/cutils.h"

 #define CMD_NOFILE_OK   0x01
--- a/qmp.c
+++ b/qmp.c
@ -36,7 +36,6 @@
 #include "qom/object_interfaces.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/acpi/acpi_dev_interface.h"
-#include "qemu/uuid.h"

 NameInfo *qmp_query_name(Error **errp)
 {
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@ -7,10 +7,7 @@
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "migration/cpu.h"
-#include "exec/exec-all.h"

-#include "cpu.h"
-#include "exec/exec-all.h"
 #include "sysemu/kvm.h"

 #include "qemu/error-report.h"
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@ -2,7 +2,6 @@
 #include "qemu-common.h"
 #include "cpu.h"
 #include "hw/hw.h"
-#include "cpu.h"
 #include "migration/cpu.h"

 static int cpu_post_load(void *opaque, int version_id)
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@ -8,7 +8,6 @@
 #include "helper_regs.h"
 #include "mmu-hash64.h"
 #include "migration/cpu.h"
-#include "exec/exec-all.h"

 static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
 {
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@ -23,7 +23,6 @@
 #include "exec/helper-proto.h"

 #include "helper_regs.h"
-#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"

 //#define DEBUG_OP
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@ -6,10 +6,7 @@
 #include "hw/boards.h"
 #include "qemu/timer.h"

-#include "cpu.h"
-#include "exec/exec-all.h"
 #include "migration/cpu.h"
-#include "exec/exec-all.h"

 #ifdef TARGET_SPARC64
 static const VMStateDescription vmstate_cpu_timer = {
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@ -36,7 +36,6 @@
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
-#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/semihost.h"

--- a/tests/crypto-tls-x509-helpers.h
+++ b/tests/crypto-tls-x509-helpers.h
@ -21,9 +21,6 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>

-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-
 #if !(defined WIN32) && \
    defined(CONFIG_TASN1) && \
    (LIBGNUTLS_VERSION_NUMBER >= 0x020600)
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@ -22,8 +22,6 @@
 #include "libqos/virtio-pci.h"
 #include "qapi/error.h"

-#include "libqos/pci-pc.h"
-#include "libqos/virtio-pci.h"
 #include "libqos/malloc-pc.h"
 #include "hw/virtio/virtio-net.h"

--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@ -28,7 +28,6 @@

 #include "qemu/osdep.h"
 #include <termios.h>
-#include <termios.h>

 #include <glib/gprintf.h>

--- a/vl.c
+++ b/vl.c
@ -110,7 +110,6 @@ int main(int argc, char **argv)
 #include "trace.h"
 #include "trace/control.h"
 #include "qemu/queue.h"
-#include "sysemu/cpus.h"
 #include "sysemu/arch_init.h"

 #include "ui/qemu-spice.h"