Re: [PATCH v4 19/19] Drop duplicate #include
Markus Armbruster wrote: > Tracked down with the help of scripts/clean-includes. > > Signed-off-by: Markus Armbruster > diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c > index b9a37ef255..8b7d1af75d 100644 > --- 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" Ouch Reviewed-by: Juan Quintela I don't want to look into the logs. They *could* say that it was me the one doing the mess.
Re: [PATCH v4 19/19] Drop duplicate #include
On Thu, 19 Jan 2023 07:59:59 +0100
Markus Armbruster wrote:
> Tracked down with the help of scripts/clean-includes.
>
> Signed-off-by: Markus Armbruster
> ---
For ppc changes.
Reviewed-by: Greg Kurz
> include/hw/arm/fsl-imx6ul.h | 1 -
> include/hw/arm/fsl-imx7.h | 1 -
> backends/tpm/tpm_emulator.c | 1 -
> hw/acpi/piix4.c | 1 -
> hw/alpha/dp264.c | 1 -
> hw/arm/virt.c | 1 -
> hw/arm/xlnx-versal.c | 1 -
> hw/block/pflash_cfi01.c | 1 -
> hw/core/machine.c | 1 -
> hw/hppa/machine.c | 1 -
> hw/i386/acpi-build.c | 1 -
> hw/loongarch/acpi-build.c | 1 -
> hw/misc/macio/cuda.c | 1 -
> hw/misc/macio/pmu.c | 1 -
> hw/net/xilinx_axienet.c | 1 -
> hw/ppc/ppc405_uc.c| 2 --
> hw/ppc/ppc440_bamboo.c| 1 -
> hw/ppc/spapr_drc.c| 1 -
> hw/rdma/vmw/pvrdma_dev_ring.c | 1 -
> hw/remote/machine.c | 1 -
> hw/remote/remote-obj.c| 1 -
> hw/rtc/mc146818rtc.c | 1 -
> hw/s390x/virtio-ccw-serial.c | 1 -
> migration/postcopy-ram.c | 2 --
> softmmu/dirtylimit.c | 1 -
> softmmu/runstate.c| 1 -
> softmmu/vl.c | 1 -
> target/loongarch/translate.c | 1 -
> target/mips/tcg/translate.c | 1 -
> target/nios2/translate.c | 2 --
> tests/unit/test-cutils.c | 1 -
> ui/gtk.c | 1 -
> util/oslib-posix.c| 4
> 33 files changed, 39 deletions(-)
>
> diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
> index 7812e516a5..1952cb984d 100644
> --- 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 4e5e071864..355bd8ea83 100644
> --- 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/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
> index 49cc3d749d..2b440d2c9a 100644
> --- 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 0a81f1ad93..df39f91294 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -35,7 +35,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 c502c8c62a..4161f559a7 100644
> --- 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 ea2413a0ba..d3849d7233 100644
> --- 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 57276e1506..69b1b99e93 100644
> --- 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 0cbc2fb4cb..d11406eada 100644
> --- 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 616f3a207c..67cf9f9dcd 100644
> --- 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"
>
>
Re: [PATCH v4 19/19] Drop duplicate #include
* Markus Armbruster (arm...@redhat.com) wrote:
> Tracked down with the help of scripts/clean-includes.
>
> Signed-off-by: Markus Armbruster
> ---
> include/hw/arm/fsl-imx6ul.h | 1 -
> include/hw/arm/fsl-imx7.h | 1 -
> backends/tpm/tpm_emulator.c | 1 -
> hw/acpi/piix4.c | 1 -
> hw/alpha/dp264.c | 1 -
> hw/arm/virt.c | 1 -
> hw/arm/xlnx-versal.c | 1 -
> hw/block/pflash_cfi01.c | 1 -
> hw/core/machine.c | 1 -
> hw/hppa/machine.c | 1 -
> hw/i386/acpi-build.c | 1 -
> hw/loongarch/acpi-build.c | 1 -
> hw/misc/macio/cuda.c | 1 -
> hw/misc/macio/pmu.c | 1 -
> hw/net/xilinx_axienet.c | 1 -
> hw/ppc/ppc405_uc.c| 2 --
> hw/ppc/ppc440_bamboo.c| 1 -
> hw/ppc/spapr_drc.c| 1 -
> hw/rdma/vmw/pvrdma_dev_ring.c | 1 -
> hw/remote/machine.c | 1 -
> hw/remote/remote-obj.c| 1 -
> hw/rtc/mc146818rtc.c | 1 -
> hw/s390x/virtio-ccw-serial.c | 1 -
> migration/postcopy-ram.c | 2 --
> softmmu/dirtylimit.c | 1 -
> softmmu/runstate.c| 1 -
> softmmu/vl.c | 1 -
> target/loongarch/translate.c | 1 -
> target/mips/tcg/translate.c | 1 -
> target/nios2/translate.c | 2 --
> tests/unit/test-cutils.c | 1 -
> ui/gtk.c | 1 -
> util/oslib-posix.c| 4
> 33 files changed, 39 deletions(-)
>
> diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
> index 7812e516a5..1952cb984d 100644
> --- 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 4e5e071864..355bd8ea83 100644
> --- 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/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
> index 49cc3d749d..2b440d2c9a 100644
> --- 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 0a81f1ad93..df39f91294 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -35,7 +35,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 c502c8c62a..4161f559a7 100644
> --- 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 ea2413a0ba..d3849d7233 100644
> --- 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 57276e1506..69b1b99e93 100644
> --- 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 0cbc2fb4cb..d11406eada 100644
> --- 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 616f3a207c..67cf9f9dcd 100644
> --- 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[] = {};
> const size_t
[PATCH v4 19/19] Drop duplicate #include
Tracked down with the help of scripts/clean-includes.
Signed-off-by: Markus Armbruster
---
include/hw/arm/fsl-imx6ul.h | 1 -
include/hw/arm/fsl-imx7.h | 1 -
backends/tpm/tpm_emulator.c | 1 -
hw/acpi/piix4.c | 1 -
hw/alpha/dp264.c | 1 -
hw/arm/virt.c | 1 -
hw/arm/xlnx-versal.c | 1 -
hw/block/pflash_cfi01.c | 1 -
hw/core/machine.c | 1 -
hw/hppa/machine.c | 1 -
hw/i386/acpi-build.c | 1 -
hw/loongarch/acpi-build.c | 1 -
hw/misc/macio/cuda.c | 1 -
hw/misc/macio/pmu.c | 1 -
hw/net/xilinx_axienet.c | 1 -
hw/ppc/ppc405_uc.c| 2 --
hw/ppc/ppc440_bamboo.c| 1 -
hw/ppc/spapr_drc.c| 1 -
hw/rdma/vmw/pvrdma_dev_ring.c | 1 -
hw/remote/machine.c | 1 -
hw/remote/remote-obj.c| 1 -
hw/rtc/mc146818rtc.c | 1 -
hw/s390x/virtio-ccw-serial.c | 1 -
migration/postcopy-ram.c | 2 --
softmmu/dirtylimit.c | 1 -
softmmu/runstate.c| 1 -
softmmu/vl.c | 1 -
target/loongarch/translate.c | 1 -
target/mips/tcg/translate.c | 1 -
target/nios2/translate.c | 2 --
tests/unit/test-cutils.c | 1 -
ui/gtk.c | 1 -
util/oslib-posix.c| 4
33 files changed, 39 deletions(-)
diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
index 7812e516a5..1952cb984d 100644
--- 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 4e5e071864..355bd8ea83 100644
--- 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/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
index 49cc3d749d..2b440d2c9a 100644
--- 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 0a81f1ad93..df39f91294 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -35,7 +35,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 c502c8c62a..4161f559a7 100644
--- 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 ea2413a0ba..d3849d7233 100644
--- 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 57276e1506..69b1b99e93 100644
--- 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 0cbc2fb4cb..d11406eada 100644
--- 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 616f3a207c..67cf9f9dcd 100644
--- 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[] = {};
const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index de1cc7ab71..7ac68c943f 100644
--- 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
