hw/arm/msf2-soc.c | 1 - hw/i386/kvm/ioapic.c | 1 - hw/i386/xen/xen_platform.c | 1 - hw/m68k/q800.c | 1 - hw/m68k/virt.c | 1 - hw/misc/led.c | 1 - hw/misc/virt_ctrl.c | 1 - hw/ppc/prep.c | 1 - hw/riscv/microchip_pfsoc.c | 1 - hw/sd/cadence_sdhci.c | 1 - hw/timer/sse-counter.c | 1 - hw/usb/xlnx-usb-subsystem.c | 1 - 12 files changed, 12 deletions(-)
Many files include hw/irq.h without needing it. Remove the superfluous
include statements.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/msf2-soc.c | 1 -
hw/i386/kvm/ioapic.c | 1 -
hw/i386/xen/xen_platform.c | 1 -
hw/m68k/q800.c | 1 -
hw/m68k/virt.c | 1 -
hw/misc/led.c | 1 -
hw/misc/virt_ctrl.c | 1 -
hw/ppc/prep.c | 1 -
hw/riscv/microchip_pfsoc.c | 1 -
hw/sd/cadence_sdhci.c | 1 -
hw/timer/sse-counter.c | 1 -
hw/usb/xlnx-usb-subsystem.c | 1 -
12 files changed, 12 deletions(-)
diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index d2c29e82d1..5cfe7caf83 100644
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include "exec/address-spaces.h"
#include "hw/char/serial.h"
-#include "hw/irq.h"
#include "hw/arm/msf2-soc.h"
#include "hw/misc/unimp.h"
#include "sysemu/sysemu.h"
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index dfc3c98005..71a563181e 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "monitor/monitor.h"
#include "hw/i386/x86.h"
-#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/i386/ioapic_internal.h"
#include "hw/i386/apic_internal.h"
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 01ae1fb161..bf4f20e92b 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include "hw/ide.h"
#include "hw/pci/pci.h"
-#include "hw/irq.h"
#include "hw/xen/xen_common.h"
#include "migration/vmstate.h"
#include "hw/xen/xen-legacy-backend.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 1c7f7aa07f..d1ab1ff77d 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -27,7 +27,6 @@
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "hw/boards.h"
-#include "hw/irq.h"
#include "hw/or-irq.h"
#include "elf.h"
#include "hw/loader.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 18e6f11041..9469f82800 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -13,7 +13,6 @@
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "hw/boards.h"
-#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "elf.h"
#include "hw/loader.h"
diff --git a/hw/misc/led.c b/hw/misc/led.c
index f552b8b648..f6d6d68bce 100644
--- a/hw/misc/led.c
+++ b/hw/misc/led.c
@@ -10,7 +10,6 @@
#include "migration/vmstate.h"
#include "hw/qdev-properties.h"
#include "hw/misc/led.h"
-#include "hw/irq.h"
#include "trace.h"
#define LED_INTENSITY_PERCENT_MAX 100
diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c
index 2ea01bd7a1..3552d7a09a 100644
--- a/hw/misc/virt_ctrl.c
+++ b/hw/misc/virt_ctrl.c
@@ -5,7 +5,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index f1b1efdcef..af4ccb9f43 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -38,7 +38,6 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
-#include "hw/irq.h"
#include "hw/loader.h"
#include "hw/rtc/mc146818rtc.h"
#include "hw/isa/pc87312.h"
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index c4146b7a6b..01537b30eb 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -41,7 +41,6 @@
#include "qemu/cutils.h"
#include "qapi/error.h"
#include "hw/boards.h"
-#include "hw/irq.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "chardev/char.h"
diff --git a/hw/sd/cadence_sdhci.c b/hw/sd/cadence_sdhci.c
index 0b371c843d..c89538b491 100644
--- a/hw/sd/cadence_sdhci.c
+++ b/hw/sd/cadence_sdhci.c
@@ -26,7 +26,6 @@
#include "qemu/log.h"
#include "qapi/error.h"
#include "migration/vmstate.h"
-#include "hw/irq.h"
#include "hw/sd/cadence_sdhci.h"
#include "sdhci-internal.h"
diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c
index 0384051f15..16c0e8ad15 100644
--- a/hw/timer/sse-counter.c
+++ b/hw/timer/sse-counter.c
@@ -33,7 +33,6 @@
#include "trace.h"
#include "hw/timer/sse-counter.h"
#include "hw/sysbus.h"
-#include "hw/irq.h"
#include "hw/registerfields.h"
#include "hw/clock.h"
#include "hw/qdev-clock.h"
diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c
index 568257370c..c760c3058a 100644
--- a/hw/usb/xlnx-usb-subsystem.c
+++ b/hw/usb/xlnx-usb-subsystem.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
-#include "hw/irq.h"
#include "hw/register.h"
#include "qemu/bitops.h"
#include "qemu/log.h"
--
2.27.0
On Sat, Mar 27, 2021 at 1:02 AM Thomas Huth <thuth@redhat.com> wrote: > > Many files include hw/irq.h without needing it. Remove the superfluous > include statements. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/arm/msf2-soc.c | 1 - > hw/i386/kvm/ioapic.c | 1 - > hw/i386/xen/xen_platform.c | 1 - > hw/m68k/q800.c | 1 - > hw/m68k/virt.c | 1 - > hw/misc/led.c | 1 - > hw/misc/virt_ctrl.c | 1 - > hw/ppc/prep.c | 1 - > hw/riscv/microchip_pfsoc.c | 1 - > hw/sd/cadence_sdhci.c | 1 - > hw/timer/sse-counter.c | 1 - > hw/usb/xlnx-usb-subsystem.c | 1 - > 12 files changed, 12 deletions(-) > > diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c > index d2c29e82d1..5cfe7caf83 100644 > --- a/hw/arm/msf2-soc.c > +++ b/hw/arm/msf2-soc.c > @@ -27,7 +27,6 @@ > #include "qapi/error.h" > #include "exec/address-spaces.h" > #include "hw/char/serial.h" > -#include "hw/irq.h" > #include "hw/arm/msf2-soc.h" > #include "hw/misc/unimp.h" > #include "sysemu/sysemu.h" > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > index dfc3c98005..71a563181e 100644 > --- a/hw/i386/kvm/ioapic.c > +++ b/hw/i386/kvm/ioapic.c > @@ -13,7 +13,6 @@ > #include "qemu/osdep.h" > #include "monitor/monitor.h" > #include "hw/i386/x86.h" > -#include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "hw/i386/ioapic_internal.h" > #include "hw/i386/apic_internal.h" > diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c > index 01ae1fb161..bf4f20e92b 100644 > --- a/hw/i386/xen/xen_platform.c > +++ b/hw/i386/xen/xen_platform.c > @@ -27,7 +27,6 @@ > #include "qapi/error.h" > #include "hw/ide.h" > #include "hw/pci/pci.h" > -#include "hw/irq.h" > #include "hw/xen/xen_common.h" > #include "migration/vmstate.h" > #include "hw/xen/xen-legacy-backend.h" > diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c > index 1c7f7aa07f..d1ab1ff77d 100644 > --- a/hw/m68k/q800.c > +++ b/hw/m68k/q800.c > @@ -27,7 +27,6 @@ > #include "sysemu/sysemu.h" > #include "cpu.h" > #include "hw/boards.h" > -#include "hw/irq.h" > #include "hw/or-irq.h" > #include "elf.h" > #include "hw/loader.h" > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index 18e6f11041..9469f82800 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -13,7 +13,6 @@ > #include "sysemu/sysemu.h" > #include "cpu.h" > #include "hw/boards.h" > -#include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "elf.h" > #include "hw/loader.h" > diff --git a/hw/misc/led.c b/hw/misc/led.c > index f552b8b648..f6d6d68bce 100644 > --- a/hw/misc/led.c > +++ b/hw/misc/led.c > @@ -10,7 +10,6 @@ > #include "migration/vmstate.h" > #include "hw/qdev-properties.h" > #include "hw/misc/led.h" > -#include "hw/irq.h" > #include "trace.h" > > #define LED_INTENSITY_PERCENT_MAX 100 > diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c > index 2ea01bd7a1..3552d7a09a 100644 > --- a/hw/misc/virt_ctrl.c > +++ b/hw/misc/virt_ctrl.c > @@ -5,7 +5,6 @@ > */ > > #include "qemu/osdep.h" > -#include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "hw/sysbus.h" > #include "migration/vmstate.h" > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index f1b1efdcef..af4ccb9f43 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -38,7 +38,6 @@ > #include "qapi/error.h" > #include "qemu/error-report.h" > #include "qemu/log.h" > -#include "hw/irq.h" > #include "hw/loader.h" > #include "hw/rtc/mc146818rtc.h" > #include "hw/isa/pc87312.h" > diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c > index c4146b7a6b..01537b30eb 100644 > --- a/hw/riscv/microchip_pfsoc.c > +++ b/hw/riscv/microchip_pfsoc.c > @@ -41,7 +41,6 @@ > #include "qemu/cutils.h" > #include "qapi/error.h" > #include "hw/boards.h" > -#include "hw/irq.h" > #include "hw/loader.h" > #include "hw/sysbus.h" > #include "chardev/char.h" > diff --git a/hw/sd/cadence_sdhci.c b/hw/sd/cadence_sdhci.c > index 0b371c843d..c89538b491 100644 > --- a/hw/sd/cadence_sdhci.c > +++ b/hw/sd/cadence_sdhci.c > @@ -26,7 +26,6 @@ > #include "qemu/log.h" > #include "qapi/error.h" > #include "migration/vmstate.h" > -#include "hw/irq.h" > #include "hw/sd/cadence_sdhci.h" > #include "sdhci-internal.h" > > diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c > index 0384051f15..16c0e8ad15 100644 > --- a/hw/timer/sse-counter.c > +++ b/hw/timer/sse-counter.c > @@ -33,7 +33,6 @@ > #include "trace.h" > #include "hw/timer/sse-counter.h" > #include "hw/sysbus.h" > -#include "hw/irq.h" > #include "hw/registerfields.h" > #include "hw/clock.h" > #include "hw/qdev-clock.h" > diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c > index 568257370c..c760c3058a 100644 > --- a/hw/usb/xlnx-usb-subsystem.c > +++ b/hw/usb/xlnx-usb-subsystem.c > @@ -24,7 +24,6 @@ > > #include "qemu/osdep.h" > #include "hw/sysbus.h" > -#include "hw/irq.h" > #include "hw/register.h" > #include "qemu/bitops.h" > #include "qemu/log.h" > -- > 2.27.0 > >
Le 27/03/2021 à 06:02, Thomas Huth a écrit : > Many files include hw/irq.h without needing it. Remove the superfluous > include statements. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > hw/arm/msf2-soc.c | 1 - > hw/i386/kvm/ioapic.c | 1 - > hw/i386/xen/xen_platform.c | 1 - > hw/m68k/q800.c | 1 - > hw/m68k/virt.c | 1 - > hw/misc/led.c | 1 - > hw/misc/virt_ctrl.c | 1 - > hw/ppc/prep.c | 1 - > hw/riscv/microchip_pfsoc.c | 1 - > hw/sd/cadence_sdhci.c | 1 - > hw/timer/sse-counter.c | 1 - > hw/usb/xlnx-usb-subsystem.c | 1 - > 12 files changed, 12 deletions(-) > > diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c > index d2c29e82d1..5cfe7caf83 100644 > --- a/hw/arm/msf2-soc.c > +++ b/hw/arm/msf2-soc.c > @@ -27,7 +27,6 @@ > #include "qapi/error.h" > #include "exec/address-spaces.h" > #include "hw/char/serial.h" > -#include "hw/irq.h" > #include "hw/arm/msf2-soc.h" > #include "hw/misc/unimp.h" > #include "sysemu/sysemu.h" > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > index dfc3c98005..71a563181e 100644 > --- a/hw/i386/kvm/ioapic.c > +++ b/hw/i386/kvm/ioapic.c > @@ -13,7 +13,6 @@ > #include "qemu/osdep.h" > #include "monitor/monitor.h" > #include "hw/i386/x86.h" > -#include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "hw/i386/ioapic_internal.h" > #include "hw/i386/apic_internal.h" > diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c > index 01ae1fb161..bf4f20e92b 100644 > --- a/hw/i386/xen/xen_platform.c > +++ b/hw/i386/xen/xen_platform.c > @@ -27,7 +27,6 @@ > #include "qapi/error.h" > #include "hw/ide.h" > #include "hw/pci/pci.h" > -#include "hw/irq.h" > #include "hw/xen/xen_common.h" > #include "migration/vmstate.h" > #include "hw/xen/xen-legacy-backend.h" > diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c > index 1c7f7aa07f..d1ab1ff77d 100644 > --- a/hw/m68k/q800.c > +++ b/hw/m68k/q800.c > @@ -27,7 +27,6 @@ > #include "sysemu/sysemu.h" > #include "cpu.h" > #include "hw/boards.h" > -#include "hw/irq.h" > #include "hw/or-irq.h" > #include "elf.h" > #include "hw/loader.h" > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index 18e6f11041..9469f82800 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -13,7 +13,6 @@ > #include "sysemu/sysemu.h" > #include "cpu.h" > #include "hw/boards.h" > -#include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "elf.h" > #include "hw/loader.h" > diff --git a/hw/misc/led.c b/hw/misc/led.c > index f552b8b648..f6d6d68bce 100644 > --- a/hw/misc/led.c > +++ b/hw/misc/led.c > @@ -10,7 +10,6 @@ > #include "migration/vmstate.h" > #include "hw/qdev-properties.h" > #include "hw/misc/led.h" > -#include "hw/irq.h" > #include "trace.h" > > #define LED_INTENSITY_PERCENT_MAX 100 > diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c > index 2ea01bd7a1..3552d7a09a 100644 > --- a/hw/misc/virt_ctrl.c > +++ b/hw/misc/virt_ctrl.c > @@ -5,7 +5,6 @@ > */ > > #include "qemu/osdep.h" > -#include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "hw/sysbus.h" > #include "migration/vmstate.h" > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index f1b1efdcef..af4ccb9f43 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -38,7 +38,6 @@ > #include "qapi/error.h" > #include "qemu/error-report.h" > #include "qemu/log.h" > -#include "hw/irq.h" > #include "hw/loader.h" > #include "hw/rtc/mc146818rtc.h" > #include "hw/isa/pc87312.h" > diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c > index c4146b7a6b..01537b30eb 100644 > --- a/hw/riscv/microchip_pfsoc.c > +++ b/hw/riscv/microchip_pfsoc.c > @@ -41,7 +41,6 @@ > #include "qemu/cutils.h" > #include "qapi/error.h" > #include "hw/boards.h" > -#include "hw/irq.h" > #include "hw/loader.h" > #include "hw/sysbus.h" > #include "chardev/char.h" > diff --git a/hw/sd/cadence_sdhci.c b/hw/sd/cadence_sdhci.c > index 0b371c843d..c89538b491 100644 > --- a/hw/sd/cadence_sdhci.c > +++ b/hw/sd/cadence_sdhci.c > @@ -26,7 +26,6 @@ > #include "qemu/log.h" > #include "qapi/error.h" > #include "migration/vmstate.h" > -#include "hw/irq.h" > #include "hw/sd/cadence_sdhci.h" > #include "sdhci-internal.h" > > diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c > index 0384051f15..16c0e8ad15 100644 > --- a/hw/timer/sse-counter.c > +++ b/hw/timer/sse-counter.c > @@ -33,7 +33,6 @@ > #include "trace.h" > #include "hw/timer/sse-counter.h" > #include "hw/sysbus.h" > -#include "hw/irq.h" > #include "hw/registerfields.h" > #include "hw/clock.h" > #include "hw/qdev-clock.h" > diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c > index 568257370c..c760c3058a 100644 > --- a/hw/usb/xlnx-usb-subsystem.c > +++ b/hw/usb/xlnx-usb-subsystem.c > @@ -24,7 +24,6 @@ > > #include "qemu/osdep.h" > #include "hw/sysbus.h" > -#include "hw/irq.h" > #include "hw/register.h" > #include "qemu/bitops.h" > #include "qemu/log.h" > Applied to my trivial-patches branch. Thanks, Laurent
© 2016 - 2024 Red Hat, Inc.