Drop duplicate #include

Tracked down with the help of scripts/clean-includes.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230202133830.2152150-21-armbru@redhat.com>

diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
index 67e7b212e3eb0d2a1fc6f0684baef668e12a8a11..d18144b92e9061149dc656e6ca15d6d3dfa680db 100644 (file)
--- a/backends/tpm/tpm_emulator.c
+++ b/backends/tpm/tpm_emulator.c
@@ -35,7 +35,6 @@
 #include "sysemu/runstate.h"
 #include "sysemu/tpm_backend.h"
 #include "sysemu/tpm_util.h"
-#include "sysemu/runstate.h"
 #include "tpm_int.h"
 #include "tpm_ioctl.h"
 #include "migration/blocker.h"

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 724294b37858f0ca1876afd1b387dde89f518b3a..eac2125abdda91542782c3a58acbb2b5d7a7c8fc 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -34,7 +34,6 @@
 #include "sysemu/xen.h"
 #include "qapi/error.h"
 #include "qemu/range.h"
-#include "hw/acpi/pcihp.h"
 #include "hw/acpi/cpu_hotplug.h"
 #include "hw/acpi/cpu.h"
 #include "hw/hotplug.h"

diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index c502c8c62ae6e37ee30c1b055c3da3225540c9e2..4161f559a7bcfbc4117a4fdcd4af0eed71fda8e5 100644 (file)
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -18,7 +18,6 @@
 #include "net/net.h"
 #include "qemu/cutils.h"
 #include "qemu/datadir.h"
-#include "net/net.h"
 
 static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr)
 {

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ba4772828858ed6736e97b8b367bcd048a64b4fb..75f28947de07f3c8173a7333d090b73ad3bcc64a 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -33,7 +33,6 @@
 #include "qemu/units.h"
 #include "qemu/option.h"
 #include "monitor/qdev.h"
-#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index 57276e1506fe71edef688454097fb03e1caeb3b7..69b1b99e937178e859bd4e49c64a75a703a98321 100644 (file)
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -22,7 +22,6 @@
 #include "hw/misc/unimp.h"
 #include "hw/arm/xlnx-versal.h"
 #include "qemu/log.h"
-#include "hw/sysbus.h"
 
 #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72")
 #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f")

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 36d68c70f6944f075094c378faff000feb383f62..3c066e340588289ed7eda486ae1f4d37a7140474 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -45,7 +45,6 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/bitops.h"
-#include "qemu/error-report.h"
 #include "qemu/host-utils.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/core/machine.c b/hw/core/machine.c
index b5cd42cd8c9ce62ae207cf1512e518ab93b0eb6e..f73fc4c45c41eead1e2819f726b2c771629bc560 100644 (file)
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -39,7 +39,6 @@
 #include "exec/confidential-guest-support.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-pci.h"
-#include "qom/object_interfaces.h"
 
 GlobalProperty hw_compat_7_2[] = {
     { "virtio-mem", "x-early-migration", "false" },

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index de1cc7ab7102a7bfff53c7dd56fc0402f3b5ca5b..7ac68c943f4061dbf734d5e0df674dc901dd8cb9 100644 (file)
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -28,7 +28,6 @@
 #include "qapi/error.h"
 #include "net/net.h"
 #include "qemu/log.h"
-#include "net/net.h"
 
 #define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */
 

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 145389aa58f23a8ff242a2d0a842278fdd4eb783..b67dcbbb37fa155ecfa44f9c4d63a1b4b813e7f5 100644 (file)
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -76,7 +76,6 @@
 
 #include "hw/acpi/hmat.h"
 #include "hw/acpi/viot.h"
-#include "hw/acpi/cxl.h"
 
 #include CONFIG_DEVICES
 

diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index c2b237736d52336319225d2b639159f0e6380baf..f551296a0e07b959156d9d21f678849f48c6d6ff 100644 (file)
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -22,7 +22,6 @@
 /* Supported chipsets: */
 #include "hw/pci-host/ls7a.h"
 #include "hw/loongarch/virt.h"
-#include "hw/acpi/aml-build.h"
 
 #include "hw/acpi/utils.h"
 #include "hw/acpi/pci.h"

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 7208b90e1292a567fda4a5f4571c9436cd8ce785..6336dcb194828e9670a417a4427c448cd161d802 100644 (file)
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -28,7 +28,6 @@
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/misc/macio/cuda.h"
-#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "sysemu/runstate.h"
 #include "sysemu/rtc.h"

diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 8575bc12647e1f7da138b0aa35bc20d627312921..58316d187135625b6e3c18f9b3358cf586e914e2 100644 (file)
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -33,7 +33,6 @@
 #include "migration/vmstate.h"
 #include "hw/irq.h"
 #include "hw/misc/macio/pmu.h"
-#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "sysemu/runstate.h"
 #include "sysemu/rtc.h"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 7e00965323c2669fda27c3d0abfe4aff036d18ff..5b19a01eaa2bfc89a354910ed3c9f36657886fe6 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -31,7 +31,6 @@
 #include "net/net.h"
 #include "net/checksum.h"
 
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/stream.h"

diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index c973cfb04e4c60daec26dabbd9ddf1151e077145..0cc68178adf25a310fc0110c9eccc60859c428b5 100644 (file)
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -38,8 +38,6 @@
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "hw/intc/ppc-uic.h"
-#include "hw/qdev-properties.h"
-#include "qapi/error.h"
 #include "trace.h"
 
 /*****************************************************************************/

diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 81d71adf348bb800190a5942629d6dba3ee934e3..2880c81cb1f84788fbdfada7315a396bc77c09be 100644 (file)
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "qemu/error-report.h"
 #include "qemu/datadir.h"
 #include "qemu/error-report.h"
 #include "net/net.h"

diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 4923435a8b5be8d7b79c90f748f144404cbcb1a9..b5c400a94d1cd8a72dba7e134b100fcd47fdbd33 100644 (file)
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -17,7 +17,6 @@
 #include "hw/ppc/spapr_drc.h"
 #include "qom/object.h"
 #include "migration/vmstate.h"
-#include "qapi/error.h"
 #include "qapi/qapi-events-qdev.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"

diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c
index 598e6adc5eb4eec4070442dc86a086bdc5feab93..30ce22a5be3ed95c5650f90d37ef2afe900ca377 100644 (file)
--- a/hw/rdma/vmw/pvrdma_dev_ring.c
+++ b/hw/rdma/vmw/pvrdma_dev_ring.c
@@ -14,7 +14,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/cutils.h"
 #include "hw/pci/pci.h"
 #include "cpu.h"
 #include "qemu/cutils.h"

diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index 519f855ec165cce0fd768aaeed5db7e471638cc4..fdc6c441bbd19565b7d2f72eee0baf15c4653ca1 100644 (file)
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -22,7 +22,6 @@
 #include "hw/remote/iohub.h"
 #include "hw/remote/iommu.h"
 #include "hw/qdev-core.h"
-#include "hw/remote/iommu.h"
 #include "hw/remote/vfio-user-obj.h"
 #include "hw/pci/msi.h"
 

diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
index 333e5ac44331295fa5e3497bc955051582320a14..65b6f7cc863f636204de0b7033b229b754994562 100644 (file)
--- a/hw/remote/remote-obj.c
+++ b/hw/remote/remote-obj.c
@@ -12,7 +12,6 @@
 #include "qemu/error-report.h"
 #include "qemu/notify.h"
 #include "qom/object_interfaces.h"
-#include "hw/qdev-core.h"
 #include "io/channel.h"
 #include "hw/qdev-core.h"
 #include "hw/remote/machine.h"

diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index bc1192b7ae03af970141dcad81b4265895a52749..ba612a151d27962a8e0a44a1c97efe5ebb44cc51 100644 (file)
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -43,7 +43,6 @@
 #include "qapi/error.h"
 #include "qapi/qapi-events-misc.h"
 #include "qapi/visitor.h"
-#include "hw/rtc/mc146818rtc_regs.h"
 
 //#define DEBUG_CMOS
 //#define DEBUG_COALESCED

diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c
index bf8057880ff67f423161151ee071d3b46dcdd870..8f8d2302f811e4bfa124c8a7bf8603c5c9a72c3c 100644 (file)
--- a/hw/s390x/virtio-ccw-serial.c
+++ b/hw/s390x/virtio-ccw-serial.c
@@ -15,7 +15,6 @@
 #include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-serial.h"
 #include "virtio-ccw.h"
-#include "hw/virtio/virtio-serial.h"
 
 #define TYPE_VIRTIO_SERIAL_CCW "virtio-serial-ccw"
 OBJECT_DECLARE_SIMPLE_TYPE(VirtioSerialCcw, VIRTIO_SERIAL_CCW)

diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
index 7812e516a5277425f41343a1f4e83d7bfec3ae8e..1952cb984d670c6909fd6f5fdfe2cb3b2e709d64 100644 (file)
--- a/include/hw/arm/fsl-imx6ul.h
+++ b/include/hw/arm/fsl-imx6ul.h
@@ -30,7 +30,6 @@
 #include "hw/timer/imx_gpt.h"
 #include "hw/timer/imx_epit.h"
 #include "hw/i2c/imx_i2c.h"
-#include "hw/gpio/imx_gpio.h"
 #include "hw/sd/sdhci.h"
 #include "hw/ssi/imx_spi.h"
 #include "hw/net/imx_fec.h"

diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h
index 4e5e07186486e7bf3b7e8dbe68cb8a9b07ee39b6..355bd8ea838d6a593221526923af691b8836790d 100644 (file)
--- a/include/hw/arm/fsl-imx7.h
+++ b/include/hw/arm/fsl-imx7.h
@@ -32,7 +32,6 @@
 #include "hw/timer/imx_gpt.h"
 #include "hw/timer/imx_epit.h"
 #include "hw/i2c/imx_i2c.h"
-#include "hw/gpio/imx_gpio.h"
 #include "hw/sd/sdhci.h"
 #include "hw/ssi/imx_spi.h"
 #include "hw/net/imx_fec.h"

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index b98e95dab0e91296b167cdb6256bfb1d56bc42df..53299b7a5ebd7d8fae68eb069f07d14f73577bd5 100644 (file)
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -17,7 +17,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/rcu.h"
 #include "qemu/madvise.h"
 #include "exec/target_page.h"
 #include "migration.h"
@@ -34,7 +33,6 @@
 #include "hw/boards.h"
 #include "exec/ramblock.h"
 #include "socket.h"
-#include "qemu-file.h"
 #include "yank_functions.h"
 #include "tls.h"
 #include "qemu/userfaultfd.h"

diff --git a/softmmu/dirtylimit.c b/softmmu/dirtylimit.c
index 12668555f2c14c6e680b38ed18d619af751be5ce..c56f0f58c8c9eb2030ea4325aaf31bab63bbb073 100644 (file)
--- a/softmmu/dirtylimit.c
+++ b/softmmu/dirtylimit.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu/main-loop.h"
 #include "qapi/qapi-commands-migration.h"
 #include "qapi/qmp/qdict.h"

diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index cab9f6fc075b45b4f05d7747dad8a6dae89c983f..f9ad88e6a733b9273308d9590da9c9cc76d32a7f 100644 (file)
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -41,7 +41,6 @@
 #include "qapi/qapi-commands-run-state.h"
 #include "qapi/qapi-events-run-state.h"
 #include "qemu/error-report.h"
-#include "qemu/log.h"
 #include "qemu/job.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 5355a7fe5ab29f24e9c26c0a29ba02c12b08fd5d..b2ee3fee3f0631b0fa58f299689e16a457beb6b0 100644 (file)
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -129,7 +129,6 @@
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/qapi-visit-qom.h"
 #include "qapi/qapi-commands-ui.h"
-#include "qapi/qmp/qdict.h"
 #include "block/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/iothread.h"

diff --git a/target/loongarch/translate.c b/target/loongarch/translate.c
index 38ced698031f33bffed2df2daed80ac25c460173..72a62756653bcca1fd58f63a716af928d15fa1e6 100644 (file)
--- a/target/loongarch/translate.c
+++ b/target/loongarch/translate.c
@@ -12,7 +12,6 @@
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"
 
-#include "exec/translator.h"
 #include "exec/log.h"
 #include "qemu/qemu-print.h"
 #include "fpu/softfloat.h"

diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c
index 624e6b77860306f39dc6ba43dfc434951f1aa880..aa12bb708adab479eb87426359de0324f28cebc8 100644 (file)
--- a/target/mips/tcg/translate.c
+++ b/target/mips/tcg/translate.c
@@ -32,7 +32,6 @@
 #include "semihosting/semihost.h"
 
 #include "trace.h"
-#include "exec/translator.h"
 #include "exec/log.h"
 #include "qemu/qemu-print.h"
 #include "fpu_helper.h"

diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 4db8b47744bc78c3496232da00f341be5061a2b2..7aee65a0895ed5c8a75d91ca856e222b0d02e14c 100644 (file)
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -938,8 +938,6 @@ static const char * const cr_regnames[NUM_CR_REGS] = {
 };
 #endif
 
-#include "exec/gen-icount.h"
-
 /* generate intermediate code for basic block 'tb'.  */
 static void nios2_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
 {

diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c
index 2126b463919b72d87f3d1bf807c9007c8a2ef237..3c4f875420256d8c17bea58b7de1dbf806cc802c 100644 (file)
--- a/tests/unit/test-cutils.c
+++ b/tests/unit/test-cutils.c
@@ -26,7 +26,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/units.h"
 #include "qemu/cutils.h"
 #include "qemu/units.h"
 

diff --git a/ui/gtk.c b/ui/gtk.c
index 4817623c8f3f92b287b75896a6d45206de56393d..7f752d8b7d6ad95b5475c60a8f226e5ad22cdf80 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -53,7 +53,6 @@
 #include <math.h>
 
 #include "trace.h"
-#include "qemu/cutils.h"
 #include "ui/input.h"
 #include "sysemu/runstate.h"
 #include "sysemu/sysemu.h"

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index fd03fd32c874dda73751beacf7632a627423f825..77d882e6818c03d4448ba62b9ec5c80c5f82ab2f 100644 (file)
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -59,10 +59,6 @@
 
 #include "qemu/mmap-alloc.h"
 
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#include "qemu/error-report.h"
-#endif
-
 #define MAX_MEM_PREALLOC_THREAD_COUNT 16
 
 struct MemsetThread;