Include hw/hw.h exactly where needed

In my "build everything" tree, changing hw/hw.h triggers a recompile
of some 2600 out of 6600 objects (not counting tests and objects that
don't depend on qemu/osdep.h).

The previous commits have left only the declaration of hw_error() in
hw/hw.h.  This permits dropping most of its inclusions.  Touching it
now recompiles less than 200 objects.

Signed-off-by: Markus Armbruster <[email protected]>
Reviewed-by: Alistair Francis <[email protected]>
Message-Id: <20190812052359[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index f450f25295ed1a4e28b8f5e9ef016e314db8895c..d20da99c213c7ec560c24311f1c6003ef59bffde 100644 (file)
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -23,7 +23,6 @@
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/s390x/adapter.h"

diff --git a/audio/audio.c b/audio/audio.c
index cf65ae49f4d32a984c970d340c1716eebd5a1835..b9b2d07e540ba47ba52d71cc28a4cbdc9b80491a 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "audio.h"
 #include "migration/vmstate.h"
 #include "monitor/monitor.h"

diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 0ead5ae43adecb881f2e9d01b60b0a87745fae7e..ec1c8fe936964e43e709fa05262eb985fcd6769b 100644 (file)
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/host-utils.h"
 #include "qemu/module.h"
 #include "qemu/error-report.h"

diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 74320dfecc768ce7801f4d80298fff41dd5d53d0..493edc60e455d900ffb3231704011cb5ea61b441 100644 (file)
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "monitor/monitor.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/cpus.c b/cpus.c
index 4ebdacdd447e06385a25dc89def944cfc0b98d5b..e70cc58e316fe90634800a5f0c5814db170ea819 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -56,6 +56,7 @@
 #include "hw/nmi.h"
 #include "sysemu/replay.h"
 #include "hw/boards.h"
+#include "hw/hw.h"
 
 #ifdef CONFIG_LINUX
 

diff --git a/device-hotplug.c b/device-hotplug.c
index 6153259d7127ac106883abb646affcc869efa12b..f01d53774b062636aa81eaa13bd08af7ff46e87f 100644 (file)
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

diff --git a/exec.c b/exec.c
index 3e78de3b8f8bb1914811a796537790bc4df8ad2f..78f849de9977c98fbab6d097c0557eeccbe02296 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -42,7 +42,6 @@
 #if defined(CONFIG_USER_ONLY)
 #include "qemu.h"
 #else /* !CONFIG_USER_ONLY */
-#include "hw/hw.h"
 #include "exec/memory.h"
 #include "exec/ioport.h"
 #include "sysemu/dma.h"

diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
index 25ab04d95af91a172b8268d02b9d010326f7b30b..c50b1961d3e1d264a19290b1b4f97d58e528435b 100644 (file)
--- a/hw/9pfs/xen-9p-backend.c
+++ b/hw/9pfs/xen-9p-backend.c
@@ -10,7 +10,6 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/hw.h"
 #include "hw/9pfs/9p.h"
 #include "hw/xen/xen-legacy-backend.h"
 #include "hw/9pfs/xen-9pfs.h"

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 39e9fb1a6c9bb0a971a42fdb10dde0e289a1f3a9..f36d60f619724fea8247677cde98439cff88217b 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -21,7 +21,6 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/acpi/acpi.h"
 #include "hw/nvram/fw_cfg.h"

diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 52439181253aec9a4b58b3e00b3287140d9874fc..a83567e6aa86754f5bc57bff2e51f321076a7356 100644 (file)
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -10,7 +10,6 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/acpi/cpu_hotplug.h"
 #include "qapi/error.h"
 #include "qom/cpu.h"

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 88eb7dbab13c6e404f19a5bcfc617eacadfc1f19..39649cbe6a6f85ac8ee7fee020dce3a94e49505c 100644 (file)
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/i386/pc.h"

diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index 912ff6dd5c4c332325fd7882fa9ee69651a098a9..ac49a5a77b7ba3c010c2da4f51d02dcd91aca96b 100644 (file)
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -27,7 +27,6 @@
 #include "qemu/osdep.h"
 #include "hw/acpi/pcihp.h"
 
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 1896dbbfb91051d53124f25f5886b49598cb3478..ec47a9143b0052c02c21ec6a00abc61e35e2e70f 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -20,7 +20,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"
 #include "hw/isa/apm.h"

diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c
index 9684653e5e37b72220ee946438f893cde2ad5d4c..4f9d485ecf29786508dbca58e1427c3bc9e104e3 100644 (file)
--- a/hw/adc/stm32f2xx_adc.c
+++ b/hw/adc/stm32f2xx_adc.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/hw.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/adc/stm32f2xx_adc.h"

diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 9dfb835013a5806ca2b1625b1bcf999c11e1bc60..546b89bbccc70e58df1c24774fb8799422c9b295 100644 (file)
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -9,7 +9,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "elf.h"
 #include "hw/loader.h"
 #include "hw/boards.h"

diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 6797eb0abe5d986cdefdee9b3de7b33613ad63ad..5d7f8f334255794517cab3c2d17ea50831b153c3 100644 (file)
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,7 +11,6 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "sysemu/sysemu.h"
 #include "alpha_sys.h"

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index d082daf6f299ac7e8f3568d24267e68b558f2df7..8563672942b4e024476578e06647cb83cb42fcd7 100644 (file)
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -12,7 +12,6 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include <libfdt.h>
-#include "hw/hw.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/linux-boot-if.h"
 #include "sysemu/kvm.h"

diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 3db3c560048cb83f4a4aaabf395bfb84803ba4d4..219643c633ac1c8e87b64da0f829f2316d552a8a 100644 (file)
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -10,7 +10,6 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/boards.h"
 #include "strongarm.h"

diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 343cbfd7da8695e07479794af296d6db0dad5045..f26a0e8010f58a11e736c7b83fd93c706d78fb9e 100644 (file)
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -36,7 +36,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "net/net.h"
 #include "hw/block/flash.h"

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index f8fbe402dbfa99e23ae36fbc546abb14c5fad7bc..ecccb4125a8ebea1fb0a4cf3e97551bfef98b7b3 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -21,6 +21,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 
 #define TYPE_INTEGRATOR_CM "integrator_core"

diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index cd1f904c6c9a0bca87c393104611ba9de2907fe9..1bad1aea762668720cd9c9d8246b143f74bacfb0 100644 (file)
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -14,7 +14,6 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/boot.h"
 #include "net/net.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 72e522a62900d2217258b732c351900c208da185..a3cfdc307715c4bd12592351db5f953e77005320 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -19,6 +19,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/char/serial.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "hw/block/flash.h"

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 397630e2f294dbdfbce844112f01195a1abf0e94..af5e3d0ba7a43f24fe626595af9e684d7530962b 100644 (file)
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -25,7 +25,6 @@
 #include "sysemu/qtest.h"
 #include "sysemu/reset.h"
 #include "hw/boards.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/omap.h"

diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index cae78d0a3685d009dff674f0fc78022850c67a9b..75a05c36b0cf79b0d13ee118eabf76b70dc28a13 100644 (file)
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -27,7 +27,6 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"
 #include "hw/boards.h"

diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index a5eccb729073c494328c885673027379c2c2fc3b..bea47b917d801ef4cf8d4289b34f8ae014d34d34 100644 (file)
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "audio/audio.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"

diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
index c8bd497e99e9d9f22f0168a231717890e5bbfc65..203d4d28aff26ea1a8efa9b3202585c2efa5bea4 100644 (file)
--- a/hw/arm/pxa2xx_pic.c
+++ b/hw/arm/pxa2xx_pic.c
@@ -11,7 +11,6 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 003929b3e08c6797f916d446dc668df07aa454c8..2eabb9c814c94a323189599f4379f424a545a3a3 100644 (file)
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/boot.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 80c61aef16290eb4ff7f7577225e393948717971..7f136bf1872493463a9a6cbee288bcfc31a8d243 100644 (file)
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/sharpsl.h"

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 4f85eb575c306257a5cb18a1bfbc0ba5000a5433..fa9afd2b7e917024fc4ad225213efb3b88c2a9aa 100644 (file)
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -36,7 +36,6 @@
 #include "hw/acpi/acpi.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/acpi/bios-linker-loader.h"
-#include "hw/hw.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/utils.h"
 #include "hw/acpi/pci.h"

diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 810922d74e3529bbfe9f53b0626bc0c5433baccc..1e3db425ef97bdba408bb9a4554bfb7c759272ef 100644 (file)
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/boot.h"
 #include "hw/i2c/i2c.h"

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index 26ac84b38870b18cf817bd08cdf48b89208d3ae5..9af584fb12fc0327911e1ba90d23bdc994cc2f7d 100644 (file)
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/pci/pci.h"

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 7dd9a89b89fbf18dea7510b60bba86cbe571494f..62e59ccee68aee300c5ad742179a7591918a124d 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/isa/isa.h"

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index f7a39c0af401432553a3eb8f684d81252e71560a..383200e1e2f776da57f3fdb8f96170db7eb93271 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/irq.h"

diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 0289f771c10453b053c36011205c4363a9e8f7f8..39deecbbc61b5a7d01e49cebaac9ad696797d34c 100644 (file)
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -27,7 +27,6 @@
 #define SILENT_ES1370
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/pci/pci.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index 1a78cc47cd1d519e3598f4c99e6652ddce8193e6..787e04774a345e192e94b66f8d08e7fca392cc55 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/irq.h"

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 4f6fbb8b134c8d44c129598b1b9441dab14d1f84..4c33c477e1fbce057ad7e3a9f3226f80d58d4438 100644 (file)
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "intel-hda.h"
 #include "migration/vmstate.h"

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index e6f150bb0d1835734913fc43d73993aa1eb06a28..5a1fcded559fb7d20121dd2e77655900d6a6de6a 100644 (file)
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"
 #include "qemu/timer.h"

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 6345bc1d5c44f9e80ff5b92103058069b40a510a..158a456a41118208bd76dd699dd5938beb1f7897 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -13,7 +13,6 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/audio/wm8750.h"
 #include "audio/audio.h"

diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c
index 890a5fe89e5457bad0d103682996570d27b94d39..481dde10a1937aa1764720084a749dd9bb8cf446 100644 (file)
--- a/hw/audio/milkymist-ac97.c
+++ b/hw/audio/milkymist-ac97.c
@@ -22,7 +22,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 9039c9786ddc0afc22933cdb0107d88de44342c0..016946d4b280be56f74f7d57c2c74f5437d95850 100644 (file)
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 599194779dddab6e9d2eabdc69a99ea99f0ffb11..818659546ff5295c71765e9f324e01b65fe7b27a 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/irq.h"

diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c
index 0f200c5fb0d6139b7a72f60423138927e0c46d90..71c63330aceea13f1115b2806b75571720908332 100644 (file)
--- a/hw/block/dataplane/xen-block.c
+++ b/hw/block/dataplane/xen-block.c
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/xen/xen_common.h"
 #include "hw/block/xen_blkif.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/block/ecc.c b/hw/block/ecc.c
index f846ab3e01a62571aed63972a9d7f9c9edb5e8cf..1a182367ee6325bc48b94c3f5aff0c8a4d4dbc89 100644 (file)
--- a/hw/block/ecc.c
+++ b/hw/block/ecc.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "migration/vmstate.h"
 #include "hw/block/flash.h"
 

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 88feb0f45151fa1eaa5f5ae2d27c160ba42e4997..7542c8f2730a653104cde6ed468696c73e28a3ef 100644 (file)
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -28,7 +28,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/block/fdc.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 9d395169b24e59f44e27a9a6f30af53e361ee89b..c213e2ed7bc6421e117ebc139a9682c4f88158c2 100644 (file)
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -23,7 +23,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "sysemu/block-backend.h"
 #include "hw/ssi/ssi.h"
 #include "migration/vmstate.h"

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 079a8ffe80b465db8f4298c8099df38def63993b..e08853fe5e9ad818708e05e59165c5a8b3994868 100644 (file)
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -28,7 +28,6 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/block/block.h"
-#include "hw/hw.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 2d6f2604912cdbdbdb6a752b211ce8cdb4f7aa77..7bfe9de2a378837bac1061ce79dd4bb86314e488 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -37,7 +37,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/block/block.h"
 #include "hw/block/flash.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index b7070cd8ecbef314560f87d598bb14e8c5413110..18ea50f4bacf64fafc8e33fbaa5a09485408c37a 100644 (file)
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -33,7 +33,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/block/block.h"
 #include "hw/block/flash.h"
 #include "qapi/error.h"

diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index d0fae248dccbe64ee1a20b725c9f512409551eb8..9888f01ac60c703f996a617acc3d4ce39819587a 100644 (file)
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "hw/loader.h"
 #include "sysemu/qtest.h"

diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index 69d73196e2a074e771f5fb771649e667b0396f43..848a0ad0ea6ec269e0439c83dfac78b1fa950779 100644 (file)
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -17,7 +17,6 @@
 #include "qapi/visitor.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
-#include "hw/hw.h"
 #include "hw/xen/xen_common.h"
 #include "hw/block/xen_blkif.h"
 #include "hw/xen/xen-block.h"

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index e1b6d1190f468c9cbcb193a36624cf4814959828..b38d82891f64b709c15d1d5d10267a3c5be0fb6a 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -27,7 +27,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "chardev/char-fe.h"
 #include "hw/isa/isa.h"
 

diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index 79ea92249c4041df9a42c0c4ff4b3804900eefa1..cc501678ce50fda8053838fa7d563b858ba5e3c0 100644 (file)
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -27,7 +27,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/escc.c b/hw/char/escc.c
index 404002b89948a9a477b803e405d0a57c0976e364..35c6952bbd0bd37d1da19f8cb60db7274cd4a431 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index f4488fa73656a0d27b40a2ddfe4f499ce8d002b6..69dd7ac72beaccdfafb9727738fba9607cf4c292 100644 (file)
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 4b3215fe961ab199c06c2f00865764ba32e6c40f..00832fba866e9fb396d0221f4aa4345dd08da992 100644 (file)
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -23,7 +23,6 @@
 
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index c403a1fdc6254a2a464a2ea7bf4d7a84abe0e50f..1712b2296e0be8d9d4891bebf0e7ed5a9f8e2aba 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -7,7 +7,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"

diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index 53c1ca789d7f4d30beb7d143f25104d19c7de7dd..e90f84d53e755832be651ce338514127d6fd2ef5 100644 (file)
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -22,7 +22,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index b3bb1cfcecfdf3169e87b23dad6f09cb56562b4c..13e4f43c4ca3bb0216982791e388677ea4919f46 100644 (file)
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -19,7 +19,6 @@
  */
 #include "qemu/osdep.h"
 #include "chardev/char.h"
-#include "hw/hw.h"
 #include "hw/arm/omap.h"
 #include "hw/char/serial.h"
 #include "exec/address-spaces.h"

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 1798fd0c443e93fa015839c00e794b2311f86231..3980eb5909e298e33061abf9cbeb3c79b0acf14f 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "chardev/char-parallel.h"
 #include "chardev/char-fe.h"
 #include "hw/irq.h"

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 7a40aa90af19f8b082d35c532b94bd4289cdc55c..07dc16be1371a4069bfd92ea285d90bdcdea412a 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -26,7 +26,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sh4/sh.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index 47e1092263bf66f84d78e322c4862c7f54d28589..8cc9328b3fa64a0cd35ffd1b9e80d31dc4a903cd 100644 (file)
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -24,7 +24,6 @@
 #include <termios.h>
 
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "chardev/char-fe.h"
 #include "hw/xen/xen-legacy-backend.h"
 

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 250eed945c96b2dfa0b0467a25ee16d956f3702a..fa7451fd67dcd895302884d5c2b1632a2212bde8 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"

diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c
index c69453204691ad2a5f5a5178067b970fd6edc893..3ba450e1caba88fe703df77cf27aa32d77df92cb 100644 (file)
--- a/hw/core/empty_slot.c
+++ b/hw/core/empty_slot.c
@@ -10,7 +10,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "hw/empty_slot.h"

diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 04a1e2b02a32236a762fae6dbbabc0379e51011a..30b1991b529bb0b991db9bc498a29b18d8e60d8a 100644 (file)
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"

diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 49b60282cfa062d5178c0bd52aea34159ba7261c..d58e2dfdb084b4476aaba6161d5f0a164fb85d8e 100644 (file)
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -7,7 +7,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "migration/vmstate.h"

diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index d44fdec43f735b77dd1463b8b172fdae3e9888ed..2d2cc0c7a53ee693b09892fb75e6a9f1a18935fd 100644 (file)
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "boot.h"

diff --git a/hw/display/ati.c b/hw/display/ati.c
index a747c4cc98c73d12fa7057727f4f0906f5d895e1..df978a420ddfcbb5e6a774be270343da56e758a0 100644 (file)
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -24,7 +24,6 @@
 #include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/display/i2c-ddc.h"
 #include "trace.h"

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 3d99d99e2b355f6cf1a5b288e94733b51e312904..e606893f282151ba8ab9a9796fc2a11f162055bd 100644 (file)
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/display/bcm2835_fb.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index 3acc1d596791cfede3f7aaf63e4e6e654190d06e..1ddba5b16f2109be06908d733ce29a9f106bdcb0 100644 (file)
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -8,7 +8,6 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "hw/display/bochs-vbe.h"

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 3120b3cfaf331e9a65871af41a1c747d5ea2d0c5..0f5465bc147a77d4642bfb17dbcd3b7263722d1f 100644 (file)
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -38,7 +38,6 @@
 #include "sysemu/reset.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index 69cdb9e066eb26c292b5623ac1ec0678d61c3a85..49f409b638b43d5064f014f6f000767ef2843c4d 100644 (file)
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/loader.h"
 #include "hw/isa/isa.h"
 #include "cirrus_vga_internal.h"

diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 8e1508a3e67f586e5c649b1f05e89d5e7cca7f2d..c1071ecd46fb4e8b6cc14a08ff04e409123ca3af 100644 (file)
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/framebuffer.c b/hw/display/framebuffer.c
index 36e3db189aeb2cfbf283b17c65be1c2c33b4e045..4485aa335bbce829db75110463e0fc36a85729c0 100644 (file)
--- a/hw/display/framebuffer.c
+++ b/hw/display/framebuffer.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "ui/console.h"
 #include "framebuffer.h"
 

diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
index 7bfffa52dac8658e58f0c21f207aa69596c41b86..199f1227e7d41d1dbb5e4abe8c4eeabf0088cb31 100644 (file)
--- a/hw/display/milkymist-tmu2.c
+++ b/hw/display/milkymist-tmu2.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c
index b00ce04b3b33d02824001108cc2218b50a3f1bdc..6ad13f2e9e365b42872b9ae7602f83689a3e6be3 100644 (file)
--- a/hw/display/omap_lcdc.c
+++ b/hw/display/omap_lcdc.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"

diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index 4adfdb1e5d31fcc07aef00f39a19664fff586f52..80eb0d26726987e983f3cb8f6feb0d81ace1e75d 100644 (file)
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -2,7 +2,6 @@
 #define HW_QXL_H
 
 
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
 #include "qemu/thread.h"

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 6f88aaaa082b0885dcf8c657f9d79fd29f4063b0..603396358d9b64be68e93b25bd5e1a8d4906e893 100644 (file)
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -29,7 +29,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/char/serial.h"
 #include "ui/console.h"
 #include "hw/sysbus.h"

diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 74a77eb43b48c55ef62e61af5aa53a9c28ef6282..49a676d1b0eb3475d9f0916c266032d9ceb5b930 100644 (file)
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -14,7 +14,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/host-utils.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/display/tc6393xb.h"
 #include "exec/memory.h"

diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 1c4f43b52bfac3ac4c32ea51d20303144e1e5a64..e9c43e55303920a382782a3aa6b58acaf16881fd 100644 (file)
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "migration/vmstate.h"
 #include "hw/display/vga.h"
 #include "vga_int.h"

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 945952a9b0c4e5c1cbb020c09102d074806dda32..189a4afc15264040cb09c38be6b48c0207047c9a 100644 (file)
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index cb956b45458cb4cc15df15913089348d6382fdd1..86299f5e97d715a32f03148758a869b3dd1f50ac 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "vga_int.h"

diff --git a/hw/display/vga.c b/hw/display/vga.c
index f8098f63e92a7e797737439f0b898d84223f836e..573d223d46f0780495391a7643029e1a40e4fe4b 100644 (file)
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -26,7 +26,6 @@
 #include "qemu/units.h"
 #include "sysemu/reset.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/display/vga.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"

diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 79a145e2847aa6e8036e97fbe7b21d74260930b6..e5227fac2892467a4a6cb51c83e73f4662fadf1b 100644 (file)
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "qapi/error.h"

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index ebfcc46a2d7763f0f48b099bd13eac868cff347c..f0b136eb162bbb783ecbbcba8dd5098180c185b2 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -26,7 +26,6 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/loader.h"
 #include "trace.h"
 #include "ui/vnc.h"

diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 3c79913b31a67d162299f598002133881e064c87..838260b6ad143b79c302263a56d95476847a72ff 100644 (file)
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -27,7 +27,6 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 
-#include "hw/hw.h"
 #include "ui/input.h"
 #include "ui/console.h"
 #include "hw/xen/xen-legacy-backend.h"

diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index b7404cff60d3e8d0abe1c1aa543008141c59ce75..c626bd958a3e5c66e9ac2f0ca28d2c17805296e9 100644 (file)
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "migration/vmstate.h"
 #include "hw/dma/i8257.h"

diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 59bc929363ed2e7580138555f74c91435de75523..3713d5dadd00ce61521aff5fd3647aeb43490747 100644 (file)
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -14,6 +14,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/dma/pl080.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qapi/error.h"
 

diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c
index 122f87aff1f0bc0a19ecb619bf6820d4ff303744..5488d388a962cc5737d8306efef118433f6679e4 100644 (file)
--- a/hw/dma/puv3_dma.c
+++ b/hw/dma/puv3_dma.c
@@ -10,7 +10,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3

diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index d35fb59eee1150295be73f635204682ba7a8bf0d..d54e296d3ae4bfff0aed58a97db0a8f043521209 100644 (file)
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/mips/mips.h"
 #include "hw/sysbus.h"

diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 8955fe262ef809e18fbfd1440a1fa42c8c749855..16d53b92dd054ab1569e2779325e8a30a76f30ed 100644 (file)
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -26,7 +26,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sparc/sparc32_dma.h"
 #include "hw/sparc/sun4m_iommu.h"

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 83b52e4ac7eed6e1c848778416b1f51b3809611e..2c2d567a95c491b3ec16ad2f32ed25948a8ece84 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
 #include "qemu/log.h"

diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index 432f0b00fe3e506951777d7463e29d085c3a1dd4..87b0f2474725f79e9501336b83db872af31ab1c2 100644 (file)
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"

diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 6ab51a94288089ca4de72db54ff9c786d046443d..46a721779ce6bbe27583f81e6e1731cde98d2933 100644 (file)
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"

diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 54d30cada25fc45782278b187f0b95781868838f..d19e3425140ebd77faf1176b9476e08573f71e3f 100644 (file)
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -10,7 +10,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3

diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index a1ba09c6f2ebb0e92432606d584acb7a9f9fac21..9a12c683420e2f2a2517a3ffa032c6e3be9fbedc 100644 (file)
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -17,7 +17,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/arm/sharpsl.h"
 #include "hw/sysbus.h"

diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index dfb9d7a7429f24935108c6fd6887759f40bfe08e..bb9d0e033ccf8b85594d0c29181b535d6f362a0a 100644 (file)
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -15,7 +15,6 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index bc7443849652c6e9d80e5a4c7fc022da8edf4aae..2736ce835ee0705ece68c7dbe2fba275fd1d9361 100644 (file)
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -6,7 +6,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "elf.h"
 #include "hw/loader.h"
 #include "hw/boards.h"

diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index 2289128aafb2ffc3a8f8bc3ccf186d0466d4b508..b000952b98a808d39441d2de73be4c489ba475d0 100644 (file)
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/i2c/bitbang_i2c.h"
 #include "hw/sysbus.h"

diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 309a37b1faa496aca39800ac1c92fed22ef6ff41..34f34e3b0500a6087849da3b40898f0eedaa4330 100644 (file)
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"
 #include "hw/arm/omap.h"

diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index d9e3bad90d81f161e8a4b554881f6974a984c857..36994ff5857cc4f4a659a8842378029639d274ca 100644 (file)
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/i2c/smbus_master.h"

diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
index d110b417c66d3082f5cc2be3d621e14258b69145..3f015a1581bdeaa0a013b4c8f33be0ebd9a60c9c 100644 (file)
--- a/hw/i2c/ppc4xx_i2c.c
+++ b/hw/i2c/ppc4xx_i2c.c
@@ -28,7 +28,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/i2c/ppc4xx_i2c.h"
 #include "hw/irq.h"
 

diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index e05bc8c39c67611d2fab5c4c834b5c55236f6525..8642f0036d9859dbf68af9ff78f4bbe6975bcbcd 100644 (file)
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_slave.h"

diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index f7e626e95a32a3ec338472774bb60de640e5268a..564198dae99605e5d11a22ef14db158145256838 100644 (file)
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -21,7 +21,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"

diff --git a/hw/i2c/smbus_master.c b/hw/i2c/smbus_master.c
index 0a6223744c6a99f357aec085c28eed69810bfcce..dc43b8637d11ad7acda48eef28afe20fff1e5522 100644 (file)
--- a/hw/i2c/smbus_master.c
+++ b/hw/i2c/smbus_master.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_master.h"
 

diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c
index 7b145a384d4df8b034a887ceea56736a3c6b7879..5d10e27664db0e1beaa677a6f4ff1ac351b89b50 100644 (file)
--- a/hw/i2c/smbus_slave.c
+++ b/hw/i2c/smbus_slave.c
@@ -14,7 +14,6 @@
 /* TODO: Implement PEC.  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_slave.h"
 #include "migration/vmstate.h"

diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h
index 3a694b186b4e9d1870ecc42c92db757f5cd60630..e05a4eff5d9b73028d6333f1d04515bb205337f6 100644 (file)
--- a/hw/i386/amd_iommu.h
+++ b/hw/i386/amd_iommu.h
@@ -21,7 +21,6 @@
 #ifndef AMD_IOMMU_H
 #define AMD_IOMMU_H
 
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/x86-iommu.h"
 

diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index a3e33fbe5e181ae5af2989a0650dae0c60f80f5e..9a59f95497285cd8b91ff49201c9b7ddcb6a4339 100644 (file)
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qemu/option.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
 #include "multiboot.h"
 #include "hw/loader.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 1e8251d32793d7f45f877dc668f2b4a061e43ad3..14fe8233aeddb72bebd4435b0f708ac1ecffc407 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/char/serial.h"
 #include "hw/char/parallel.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 129f47493bddd601636777c8ac637b4ddaf54fa5..2fbb581c460447b044b14ed4df1ecd87b26bb7b2 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -26,7 +26,6 @@
 #include "config-devices.h"
 
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/loader.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/apic.h"

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 397e1fdd2f37b978c2e42cc6ab408041b677592e..060b47f84594129d3688329d9399b4bf2aa22773 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -30,7 +30,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/loader.h"
 #include "sysemu/arch_init.h"
 #include "hw/i2c/smbus_eeprom.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index de43943af8076733b67551d2896c1442033578df..defea37fe44e0307120cffe299ca0dd6c8db498f 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -31,7 +31,6 @@
 #include "qemu/option.h"
 #include "qemu/units.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/boards.h"
 #include "hw/loader.h"

diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index a50f5d5dd455171515673ab47cf3e59f5a6c340b..4f8150457765ae94f98cd1535b2171ba498dd0c3 100644 (file)
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "hw/input/i8042.h"

diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 3bf8cfe041ec5239bb030e34e0e061bfbdea18d6..26fcbe38272de9269c16af47ba5edf51074306d5 100644 (file)
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "hw/i386/pc.h"
 #include "hw/input/i8042.h"

diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index f769cd91f2b4229d75e9d9afbf7bf009f4d9cbcc..63abace70a84d0b757f36443c62cb37a3625ee03 100644 (file)
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -15,6 +15,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"
+#include "hw/hw.h"
 #include "hw/i386/apic-msidef.h"
 #include "hw/xen/xen_common.h"
 #include "hw/xen/xen-legacy-backend.h"

diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 800687a188ed96c5c12a92bdb328b525035bb006..0f7b05e5e1bbe2ae1f31d5a1a58c9a26e47d5aae 100644 (file)
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/ide.h"
 #include "hw/pci/pci.h"
 #include "hw/irq.h"

diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index 700db81cbc817967084e1e5b28a548678cce9346..10c89cda4113b2c387d6da1f816481be83518157 100644 (file)
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -32,7 +32,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index 8777122c9cb6b96bad6bea34257c37ab9434118e..bb8393d2b68937b9ce1cca7e4e91509bf2aa1055 100644 (file)
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -16,7 +16,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "sysemu/dma.h"

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index e0b1a91fd968d052dc562d658a11158f8be3008d..1d5a54b29e2b92ef5f4ba732be677efb53e91ac5 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -22,7 +22,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index a3763a1d3a5678e783767731cd9d3fcf95976b19..c2ee427f563ca7f68151779185e0d468f443b21c 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 0453a925f926eb294007ca72a3db789210a68412..005b4d5ef4a2eb62a6f27c3c7f1b2333d746f735 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 00fb43a127071996990ca3e4ae3825e4898d9ad8..eff3188fff8f3737ce563a0ccd72a4cf3d849cc3 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -61,7 +61,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"

diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c
index a0b3c1f6a1686aa60b8b89dc191ff36ab3082548..e6085612d4c29d4dcb2af2062750da84bdd32e1f 100644 (file)
--- a/hw/ide/ioport.c
+++ b/hw/ide/ioport.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index fda912f3edb84530c9bae2a286c0ddfc2fcd2c47..939b473dadcb2cb214c6bec3192e6b015d685f01 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index aa447cd2b58d1b65bf970595cb338f5ad936a083..44f2ff92bb618d9a07f331fc48a8f26b28713d24 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "migration/vmstate.h"

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index be3cf8779a03faedba57a020adec06b5a3531d41..b0272ea14b34c42a4da28cad1e6ce2d02b2c2a19 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pcmcia.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index f3de6db33e63669f8315caab12f0ab3026336941..d2a377f32602082217686f2ed5b78e28d9c70266 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index c5b081a028169c194ac6d76bfc2d5322d5a58012..cce1da804d0dd8ec02d366757a8684a87d8c5130 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "sysemu/dma.h"

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 407d3e3ce8c8ebe2ef83b33533da5054f171433f..bcfd119a8eac8e6c8dc2a77ec51a3c5df2df9e33 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index eea22c09f4f2df5bdeece949e7c74337f0f0ac94..d85c31a0eeb2356da8aab766ce491bb47031b005 100644 (file)
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "sysemu/dma.h"
 #include "qapi/error.h"
 #include "qapi/qapi-types-block.h"

diff --git a/hw/ide/via.c b/hw/ide/via.c
index 8fa1972d92f95a2204ea34637cead66e096f121a..45f929395fd1b9e58e84f627af1f2dda76805edd 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/input/hid.c b/hw/input/hid.c
index c570ca25b1a70a548e3ccd46e5c75fe5a9822d60..89239b5634dbbd27b0afc1a5c1292306547f0bea 100644 (file)
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "ui/console.h"
 #include "qemu/timer.h"
 #include "hw/input/hid.h"

diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index de03913d7c747ae320be4364494e93fcd1d56335..a37eb854b985bf20db2c414483e5861c70f4ab75 100644 (file)
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"

diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index e17666d56b3ed005af7b473a687c737eaea53de1..8f6fdf2d970e6cf02f83075ea1eabd45ab9da4eb 100644 (file)
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -23,7 +23,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index cf1690332d8ec93a72017d6064f1523b96683ee0..f2e32a1ed5359ac33ed827b99de3fbc04a1cd251 100644 (file)
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "migration/vmstate.h"
 #include "hw/i386/pc.h"

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 07d07ee6bd157421646667868b7d8563dd6700c7..68b30229f452797a68d3d102cc5712886cce4546 100644 (file)
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/hw.h"
 #include "hw/input/ps2.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"

diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index 7582117f0bae1a9ab8d4b6fb431df3dd8c254add..59892b07fc55870e8bd2c9424b4567ea88493604 100644 (file)
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/input/gamepad.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"

diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index b92a034496b4b1368edbcc8b8f90c739be345b1d..55d61cc843ac682288a8d573dd9556fc61d8428c 100644 (file)
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "sysemu/reset.h"
 #include "ui/console.h"

diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c
index dc72dd541280880f5eaa593ed18c12a99202b48c..88d3b0c36fd9c991bb425cbe58e346df73c6c794 100644 (file)
--- a/hw/intc/etraxfs_pic.c
+++ b/hw/intc/etraxfs_pic.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 //#include "pc.h"
 //#include "etraxfs.h"

diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index 3b49ce4d274930340eb7afbe1538ac2b35880247..833e164350f3a58d34c4e447b9418eea6095de60 100644 (file)
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -33,6 +33,7 @@
 #include "qemu/module.h"
 
 #include "hw/arm/exynos4210.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 
 //#define DEBUG_COMBINER

diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
index 572e9115aa84adb1262e0b9a4a3adb1d3754d513..cb97c315dac5742ee7be01ff83681981fc2ce0d4 100644 (file)
--- a/hw/intc/heathrow_pic.c
+++ b/hw/intc/heathrow_pic.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index e581e6b0abc71a8ec5e96c4fd2a82e95b5b0585c..211a98962e99882f8b495fa91041207fa9c0b627 100644 (file)
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"

diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index e99c37ccebc08f0c50ac39b07f36293581ecbf1b..c346f50df993eec6f9b5a983a6e2a02c5d68cd83 100644 (file)
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -23,7 +23,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "monitor/monitor.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/apic.h"
 #include "hw/i386/ioapic.h"

diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c
index 4df4eef7df6e9b2777add2e49be81ec929e09e20..36de670c9e8c3f6aeba4703f588dcdc8d0dab7ec 100644 (file)
--- a/hw/intc/lm32_pic.c
+++ b/hw/intc/lm32_pic.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/hw.h"
 #include "migration/vmstate.h"
 #include "monitor/monitor.h"
 #include "qemu/module.h"

diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 166eb6ecce7ace5026a2fa8484a036f60216d47f..6b4322bc5c13bf85c4cd8ca11141b45228bc5eed 100644 (file)
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -13,7 +13,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "exec/memory.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index 4b3ddc0a679ab2b26a810bbf7dd2c00e0c82a65e..f740578e7ea2efa6138abe74ac204bc51ee14305 100644 (file)
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"

diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index 77591f827dda4902cd6461701d8f7710a3370b3c..8a4a422142225176bf2018ca7faa22a84e629422 100644 (file)
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -10,7 +10,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index bb869ca2213e32b7fc49f6c3cb6eda975c339dab..312ac54c7cb2674ed78cf3328cf91dd706831689 100644 (file)
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -35,7 +35,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/mac.h"
 #include "hw/pci/pci.h"

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 49fc6fa0cf3e53f529e22b3e377319bcf04f4fff..e91910b331c4cfd0a25b12923ca24acaff897020 100644 (file)
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -27,7 +27,6 @@
 #include "cpu.h"
 #include <sys/ioctl.h>
 #include "exec/address-spaces.h"
-#include "hw/hw.h"
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/openpic_kvm.h"
 #include "hw/pci/msi.h"

diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c
index 62521500f9fe6e18d18687a6ee99fb9a3585e3c4..72a55e32dd4de859b10bf58db078963105bfcc46 100644 (file)
--- a/hw/intc/sh_intc.c
+++ b/hw/intc/sh_intc.c
@@ -11,7 +11,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "hw/sh4/sh_intc.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sh4/sh.h"
 

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 41da9b3091c382b2a68f39d78a2a05c31f3f68f3..88709d4b908f7baac264c25cad05ba6e5222b899 100644 (file)
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -28,7 +28,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "trace.h"
 #include "qemu/timer.h"
 #include "hw/ppc/xics.h"

diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 65c35f90f9afadf50400c69f372da825912ba8da..a4d2e876cc5f11e142bf1a42de30fb6abf124873 100644 (file)
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -29,7 +29,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "trace.h"
 #include "sysemu/kvm.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
index 7cd3c93d719fb3cd05e7412e42ed5b0a490efa42..6577be0d92ab85254e70fdf2b1d64fb0d0f4579f 100644 (file)
--- a/hw/intc/xics_spapr.c
+++ b/hw/intc/xics_spapr.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "trace.h"
 #include "qemu/timer.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c
index baf5353cd1988ffe4b329c1d15c9449746ea4dec..3a5c7f82f4057e2968cf39f62de3176fab6eae75 100644 (file)
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 
 #define D(x)

diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index a837f91782a7375738585b2321ea139715596c9d..2090c6f73a4dd530ff8010b011567a0445ab020f 100644 (file)
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "sysemu/sysemu.h"
 #include "qom/object_interfaces.h"

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 588dfbac340b41a4e98f4bf6bcdcfda868071398..33c800acb59ae452456ea2f593442a9d6f7cc034 100644 (file)
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -26,7 +26,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"

diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index e63753f03ead5cf23c912430275367d65b614e8a..9a1de662ba5ed314f438c88a2c52e2063fd8ae21 100644 (file)
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -26,7 +26,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"

diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index f22b2d78a48bfccdc2809f8f1def0e676b43ba7c..6300b1ba7ace4f9fd97895e0daa8de4c9b4bbf21 100644 (file)
--- a/hw/isa/apm.c
+++ b/hw/isa/apm.c
@@ -22,7 +22,6 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/apm.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 79d44c1b413db9f0c1a5e2e686946412310d0b88..a037c21104263270b242c1a136db0b924d830929 100644 (file)
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -30,7 +30,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "qapi/visitor.h"
 #include "qemu/range.h"
 #include "hw/isa/isa.h"

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 8abd5daaaef6545901138fcb701aa6705a341cf5..3294056cd56bfaa87761b948d96d8754ea8c8e6c 100644 (file)
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index d98b94ab0560a0f77bef433178a9c3e0885ec070..7379d90cf4461ca610671d017edcab2f3ebeeb3f 100644 (file)
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/vt82c686.h"
 #include "hw/i2c/i2c.h"
 #include "hw/pci/pci.h"

diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index d7109800450042ef1c2888a51c026e411670cd4b..5ae308bfcfbe5e8860d33f5aa232e6e24b6d245d 100644 (file)
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -22,7 +22,6 @@
 #include "qemu/error-report.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/block/flash.h"
 #include "hw/boards.h"

diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 864712d9776e8339c10b69773761cdaf147af842..5ec3ae0300457f87f5f6c9ce11395c591d9fddf4 100644 (file)
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -23,7 +23,6 @@
 #include "qemu-common.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/block/flash.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 68d15a6ebe331cef804f0ebe9b152c8db3fd69cc..54ccbe1a822e5d3d028f1554a808c3c305f00ff0 100644 (file)
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -9,7 +9,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "hw/boards.h"
 #include "hw/loader.h"

diff --git a/hw/microblaze/boot.h b/hw/microblaze/boot.h
index dd1090d8b55eb53b952a658c7377ef5b5655d70a..5a8c2f797506f86b416f48b889b66cd09e551251 100644 (file)
--- a/hw/microblaze/boot.h
+++ b/hw/microblaze/boot.h
@@ -1,7 +1,6 @@
 #ifndef MICROBLAZE_BOOT_H
 #define MICROBLAZE_BOOT_H
 
-#include "hw/hw.h"
 
 void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
                             uint32_t ramsize,

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index a88bf16cc809e8a684f902c74ece323e69edfe8c..03f6c1cc7cca0180130f6d879f1d012bb18b6cc9 100644 (file)
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -30,7 +30,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 8d834742627a2ae6ef3b67c53f66ef44268ec877..849bafc186ba5988b2fda15717315a56d51b1aa8 100644 (file)
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -28,7 +28,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/mips/addr.c b/hw/mips/addr.c
index 4da46e17319a269cf1673e2ff911797b39387baa..2f138fe1ea82f5dc112dfaf582d4b57df62e870b 100644 (file)
--- a/hw/mips/addr.c
+++ b/hw/mips/addr.c
@@ -21,7 +21,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/mips/cpudevs.h"
 
 static int mips_um_ksegs;

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 9eeccbea9a5a9d3e2542074222722f188a21ac8f..ce86b75664dd85c27a42e1dcc7dd57623bafc639 100644 (file)
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -23,7 +23,6 @@
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
 #include "hw/char/serial.h"
-#include "hw/hw.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"
 #include "hw/loader.h"

diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index b4412c6c24b531708180d11e6f28b53e0cecd7e6..f325bd6c1c9825d23f6c430b42b9b8f721d64830 100644 (file)
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/log.h"
-#include "hw/hw.h"
 #include "hw/mips/mips.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 0a1bf5ef5c7c15f1d70f75611799d82d9b92deac..6e4fba285b9d7ca74e29546a3b1105bb94d06321 100644 (file)
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -23,7 +23,6 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/dma/i8257.h"
 #include "hw/isa/superio.h"

diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c
index ae4244c32e72137511e9f4cd661e8c6e8f4b4161..74cf587d5bc1d75d6aede78b501e39bedfa5d5b9 100644 (file)
--- a/hw/mips/mips_int.c
+++ b/hw/mips/mips_int.c
@@ -22,7 +22,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/mips/cpudevs.h"
 #include "cpu.h"

diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 6ea25cd5f418048f663388d6be5da7a03f9e8a7a..388c15c3761633adec2458586f33055b65d67ef1 100644 (file)
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/i386/pc.h"

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 02200ab7d47fb06ffd2d3470ad50d5383e333991..bdba712329a470c74ffadbe7afeff379d1eb4fea 100644 (file)
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -26,7 +26,6 @@
 #include "qemu/units.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/superio.h"
 #include "hw/dma/i8257.h"

diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 280e76a4826b7fb304b6da7ed97d8e7f1e12a697..1ca7e909d14672c66fe5a86eee88037c138c38a3 100644 (file)
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -29,7 +29,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/char/serial.h"

diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 191047826d051d477b33e88b652dc7e6c9e696a0..a41b0b0524517e1489b5de7a3754ece3c29fe10b 100644 (file)
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -13,7 +13,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/i386/pc.h"

diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 2d7eb3c7e2448a29bb69575bd43f4bea5f1b517f..d9d369777c1618363ea8bc9e9405cd01ada7c2ac 100644 (file)
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -31,7 +31,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "ui/console.h"
 #include "qemu/module.h"

diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
index 2646107b9715f6e9988caac68e00193c8c173b1e..3e23201ae673d5988988aa87731e627479ae785f 100644 (file)
--- a/hw/misc/arm_integrator_debug.c
+++ b/hw/misc/arm_integrator_debug.c
@@ -15,7 +15,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/misc/arm_integrator_debug.h"
 #include "qemu/log.h"

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 47051436f49da92a832220e9d38cab54709529d1..2a4e0458c742c082cf2e94c91b800fc440bb9df9 100644 (file)
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"

diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c
index 8e4a2fc701e9617e753a9237668b5da43928ffbf..752cb53cf66e778ccb3e690f03a5f63ecf8b665d 100644 (file)
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "qemu/module.h"
 

diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index 3b6dba2c728afbd0cc1141550d573a7530cd16c2..d5e2bdbb5754d6b45e2280ca42eb38a9842cf831 100644 (file)
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/pci/pci.h"
+#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "qemu/timer.h"
 #include "qemu/main-loop.h" /* iothread mutex */

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index d9b7ea145c900437285e28318168a705a3717651..7a2334c98b6c605bbd9dc0cd244c48a590435c86 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -21,7 +21,6 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index feb80df0ff2fecddf85d664ec7238100bdf0404d..5e8ee80c255905a09a6d07978b49495e5abe66d8 100644 (file)
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "migration/vmstate.h"
 #include "hw/input/adb.h"

diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index 6f90afefb7c3c01abebd5eea656af4445ba3ca5a..e62b62211246d68cba08fcb40cb3f622ac1907e0 100644 (file)
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "migration/vmstate.h"
 #include "hw/misc/macio/macio.h"

diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index beaf0835782ebe3ad75a7fbc97291477f063854c..e220f1a92771dc9378bc2f61174701b2e14d709f 100644 (file)
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -38,7 +38,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index c797bbd6984fae00a99746d9e18ae126fb31ceb4..222f163139ff37f984937d523b11d54caeb2dfdf 100644 (file)
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "hw/misc/macio/cuda.h"
 #include "hw/pci/pci.h"

diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 507f62ba64bccb63b512eebed7c1a8e398076270..d824a068d9b1c762ec3267c180456b3004e50494 100644 (file)
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -30,7 +30,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "migration/vmstate.h"
 #include "hw/input/adb.h"

diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c
index e9722d6c7601a2004be9367e6f9559d84876b113..61e86e6b341aee6f69c639acf5d1bea158d84d83 100644 (file)
--- a/hw/misc/milkymist-hpdmc.c
+++ b/hw/misc/milkymist-hpdmc.c
@@ -22,7 +22,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c
index 8c6baf5406aff956eebce9925f400f83718b9941..516825e83deae0372861bc3a94c24290553b4e60 100644 (file)
--- a/hw/misc/milkymist-pfpu.c
+++ b/hw/misc/milkymist-pfpu.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index 6dcdb4a2259a33f96414f138464ffeaeef80653e..6bddb2312ac0fff13aa80975fac3f4a9a064a9af 100644 (file)
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -12,7 +12,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index 7e6dead089c9032e196ff49e26a21a18714dd62b..f06cf0b52a5df46b489e7504fb8d314fdff979ef 100644 (file)
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/input/adb.h"
 #include "hw/irq.h"
 #include "hw/misc/mos6522.h"

diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index d002870e565805bb14c3dfc33fa24ac1dd0c2ac4..81abdf8ede645e7109bb5c159237c6cb1700ffdc 100644 (file)
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 6253b0b2d41070d4e8e4b9cf814bb0223792c51b..10de7a55236a462f9299c60fc4f527c7ffe66ae3 100644 (file)
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -20,7 +20,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/block/flash.h"
 #include "hw/arm/omap.h"

diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
index c217728c783c20fdc767fa2a7892c2181b3bb384..61b6df564a4ccb56f476782fc7da0836c573adc7 100644 (file)
--- a/hw/misc/omap_l4.c
+++ b/hw/misc/omap_l4.c
@@ -18,7 +18,6 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/arm/omap.h"
 
 struct omap_l4_s {

diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index 7b38c5568ce211f910bcf1ec83d98f70175ba378..f2f72f6810bb96b9b122ad161466e96fed566bba 100644 (file)
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -18,7 +18,6 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/arm/omap.h"
 
 /* SDRAM Controller Subsystem */

diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 46adb6b5fcc6a90fa47cc1a2f82fef08b1fc6d1d..94cf55440e55e0821e4e1784d3f4563565a814ff 100644 (file)
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -36,7 +36,6 @@
 */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/qdev.h"
 #include "qemu/module.h"
 #include "hw/irq.h"

diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c
index bb05811e1f3cfbba2121555bdff0c96019590c9d..73be28d9369cdb907b53751e5bbab1944a9b79f4 100644 (file)
--- a/hw/misc/pca9552.c
+++ b/hw/misc/pca9552.c
@@ -12,7 +12,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/misc/pca9552.h"
 #include "hw/misc/pca9552_regs.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index d4d89df4cf53499503e4bba1001f70124acf9e1a..0eb9ed5469591399621478bae27d3cf684baa774 100644 (file)
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "qemu/event_notifier.h"
 #include "qemu/module.h"

diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c
index b538b4afbb166cb1fdba981355b9a9720f14bc93..c213500d9c3c1122af47c3d0bec1408699190571 100644 (file)
--- a/hw/misc/puv3_pm.c
+++ b/hw/misc/puv3_pm.c
@@ -10,7 +10,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3

diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index 28996473cb027c508f250d98a3e2f4c36ad095d1..75ddad3a12d0a7fa65547a6a19fae041769e500a 100644 (file)
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c
index 6728aa7e104ec24445a176173691c06d689e1259..9f044705fa5aa50ca060ea06e190ebfee5da0816 100644 (file)
--- a/hw/misc/tmp421.c
+++ b/hw/misc/tmp421.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c
index 7f8e42cc2ccafa7ec05bbb81b24a79ccc3ffbfba..0e1cb24629ee070e6ef32711d55100446304286e 100644 (file)
--- a/hw/misc/unimp.c
+++ b/hw/misc/unimp.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/misc/unimp.h"
 #include "qemu/log.h"

diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
index edfe76ba20eb3199ba26c5853a1217e946d84ab2..7745df4c853dd30709611fe5d2d7b0fb47986bb7 100644 (file)
--- a/hw/misc/zynq-xadc.c
+++ b/hw/misc/zynq-xadc.c
@@ -14,7 +14,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/misc/zynq-xadc.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index 82430a146aa729355c34ae7a60a961634faddea3..d4fdd2c26da387c44e854b02de558d18f82b72e2 100644 (file)
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -15,7 +15,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 16a7d582744537dadd9368a5d7a78f8448e25157..57af1b48912290da6d7909528141d64f7dcf59c8 100644 (file)
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -30,7 +30,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "net/net.h"
 #include "sysemu/reset.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c
index 10963ef58c2653cfcc07e51348413d22ddb5252a..401da73cc8bd3216ec79a1bd92e22e879398b4bc 100644 (file)
--- a/hw/net/can/can_kvaser_pci.c
+++ b/hw/net/can/can_kvaser_pci.c
@@ -36,7 +36,6 @@
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "chardev/char.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c
index 9e060dff0196337c57a11c0edd91a8b58057aa24..0f0ca912c9d33eb4f7972679053c06a7322c5a75 100644 (file)
--- a/hw/net/can/can_mioe3680_pci.c
+++ b/hw/net/can/can_mioe3680_pci.c
@@ -32,7 +32,6 @@
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "chardev/char.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c
index 5d12f0c55278651b363a6dacd2060b7d22b80113..632eb0b59bc27666be9cc6204ed71b43fee68bd2 100644 (file)
--- a/hw/net/can/can_pcm3680_pci.c
+++ b/hw/net/can/can_pcm3680_pci.c
@@ -32,7 +32,6 @@
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "chardev/char.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index 6c84be6d29c88f3e64b612f6ae56c699432653f4..1f81341554f7649be65ad56218a4109f79578fc3 100644 (file)
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -28,7 +28,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "chardev/char.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index e4e91382f0fae818792ca1b9ac1726f66f70c93c..da5f3646fd0edde422d8a89f3fc9b1b7af91c498 100644 (file)
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -26,7 +26,6 @@
 
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "net/net.h"

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 22e3132581dd2ab480d238dc3b9a587f67964938..270ff938415bd8dac5a20d0a0cd2a523e907dc7a 100644 (file)
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -40,6 +40,7 @@
 #include "qemu/module.h"
 #include "qemu/range.h"
 #include "sysemu/sysemu.h"
+#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index 2a221c2ef99587c4a75e91877f92491ae1220373..40e41fdd92d4eca5cbc375efff559094a5a02c25 100644 (file)
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -37,6 +37,7 @@
 #include "sysemu/sysemu.h"
 #include "net/net.h"
 #include "net/tap.h"
+#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 

diff --git a/hw/net/e1000x_common.c b/hw/net/e1000x_common.c
index 09047806f2719177f8af872ecda6f59cac769777..717f9df1c9330850d719108a22f89b1b336564b0 100644 (file)
--- a/hw/net/e1000x_common.c
+++ b/hw/net/e1000x_common.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"
 

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 3c1c534cbff4a75c8d18cbf0c6a8b72e48df4f9d..2ad1b328e4bd51f0b37c53023dbc82fca764286e 100644 (file)
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -42,7 +42,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "net/net.h"

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 937d5603e2bbb51ecbbf695e5858299fff1109a7..1d32cb79e2ea1d51375b00d7ac20194a35099a7d 100644 (file)
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -15,6 +15,7 @@
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "net/eth.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/net/lan9118.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index a7d879f0ab2982a2b29ee013653e739a970f0901..1e3fb9c220b00f8d825620afbaa875dfb4949fb4 100644 (file)
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index 3910beb9a67c11fd24d3ac3c4f7c08d53bde13f0..013f762d72da91f8e758523f1c3ee69a88662d18 100644 (file)
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "net/net.h"
 #include "qemu/module.h"

diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h
index 2cd193e4c6401fe71b7e2e144b729b9a70333d41..fc7584370323f0b50fe581d1a3b10e4db551a736 100644 (file)
--- a/hw/net/ne2000.h
+++ b/hw/net/ne2000.h
@@ -2,7 +2,6 @@
 #define HW_NE2000_H
 
 #include "qemu/units.h"
-#include "hw/hw.h"
 #include "net/net.h"
 
 #define NE2000_PMEM_SIZE    (32 * KiB)

diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 3e759d79d88439fa6a4ae7434b38c1905a494e6e..a9e96cdd3a014dfb766888c38c1bd3986a432d8e 100644 (file)
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -32,7 +32,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/net/mii.h"
 #include "hw/sysbus.h"

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 4ce8f62a2a6a990bbf55b419ad39588bd2ed2798..789e5c48767e88ac1f556142eb6302ac5cec7b4f 100644 (file)
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -16,7 +16,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "hw/pci/msix.h"

diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index b009da4f89e46c41169084b137210ad0cf582f55..01845f11575722b0b7d10b1a0755ddd236ff0f4e 100644 (file)
--- a/hw/net/rocker/rocker_desc.c
+++ b/hw/net/rocker/rocker_desc.c
@@ -16,7 +16,6 @@
 
 #include "qemu/osdep.h"
 #include "net/net.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 
 #include "rocker.h"

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 9975af44dddd692c16d46f769fba2254e963a1bb..89156ed802c039cfd026b763161b5187a7b2933e 100644 (file)
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -53,7 +53,6 @@
 #include "qemu/osdep.h"
 #include <zlib.h>
 
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "sysemu/dma.h"

diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 0ce5e37a2811aba6b822c8076cdf6449e3946a15..60085b1bf4776634f6c4d15fe6ef712abff9dd04 100644 (file)
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
index 9d8fd70f5198f72fea7b1e387c6ede4409245415..359bd4f9f52ac6ed0da448f3b44aa29227531ac4 100644 (file)
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "hw/net/mii.h"

diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index ffb3b5898d661413fac48166726111886dc17856..00a7fdf843b0c275ac1bfd7d4824da644af198d8 100644 (file)
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -24,7 +24,6 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 
-#include "hw/hw.h"
 #include "net/net.h"
 #include "net/checksum.h"
 #include "net/util.h"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index b1247a1d9b8b7d1d9b08c942cd85a18de449ca1a..b22e344a4bddc33cce53908bd7273ffbe0b693f3 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -30,6 +30,7 @@
 #include "net/net.h"
 #include "net/checksum.h"
 
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/stream.h"
 

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 27a4fc8d870025aa95c223cd55c4344383118305..a963087f16cce5dc2bc5e5c5a706755010500dda 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -26,7 +26,6 @@
 #include "qemu/module.h"
 #include "cpu.h" /* FIXME should not use tswap* */
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "net/net.h"
 

diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index 2c3388f5cff4f3d538bec5491ee44c624d219622..3c01e4f667299409dfa558b0128f5d88dac33a90 100644 (file)
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -27,7 +27,6 @@
 #include "cpu.h"
 
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/char/serial.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"

diff --git a/hw/nios2/boot.h b/hw/nios2/boot.h
index 311675381858eabd10a69f46eb72b12ce5874242..59b9fbfc622bfc0e71e16ea4464e183a7501d6b6 100644 (file)
--- a/hw/nios2/boot.h
+++ b/hw/nios2/boot.h
@@ -1,7 +1,6 @@
 #ifndef NIOS2_BOOT_H
 #define NIOS2_BOOT_H
 
-#include "hw/hw.h"
 #include "cpu.h"
 
 void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, uint32_t ramsize,

diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index 1788ffa7a45d774f640d380169f51d847797cb8e..2ec91e899ba71b9e969f312fd342ede625d75f52 100644 (file)
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -32,7 +32,6 @@
 #include "cpu.h"
 
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/char/serial.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"

diff --git a/hw/nvram/chrp_nvram.c b/hw/nvram/chrp_nvram.c
index 3837510dd26d778b8af6ce1989057c7978b4e6a9..d969f267048e626007d284dcfa72844ddcd61c84 100644 (file)
--- a/hw/nvram/chrp_nvram.c
+++ b/hw/nvram/chrp_nvram.c
@@ -21,7 +21,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
-#include "hw/hw.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index c2b012d583f0d981ba478d7255f6fd8f562fa5e6..5b01b9b03ff3a107b0559023d95286832a0b8a04 100644 (file)
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -36,7 +36,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/nvram/eeprom93xx.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"

diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
index f75a485738d3ce298d8c8d7adda339d52e788ac1..00f942db516a62ddfcbc777d6329b554714b475a 100644 (file)
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -11,7 +11,6 @@
 
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "sysemu/block-backend.h"
 

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index a5e614016a3ae647ee17f58b3bd0382e9ffc45b2..f192c3ea16377c5b8252154452c69be6b50b1af5 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 #include "sysemu/reset.h"

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index 4f0d2f6bd40a72e2467acca05f1adc72c6f86818..853b6931093e10c3075c935d47b133a4443507e5 100644 (file)
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/ppc/mac.h"
 #include "migration/vmstate.h"

diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c
index e9f89333dc04d742dab4f7dff1103935559adc68..93268815d819bcdac9bf734aca6708bb98a7ffed 100644 (file)
--- a/hw/openrisc/cputimer.c
+++ b/hw/openrisc/cputimer.c
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 965d5b44ee7cfdca468ac7417c7afcce1bcaf91a..13572b8efff70662667ecbb1fd1a295c5186235f 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -22,7 +22,6 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/boards.h"
 #include "elf.h"

diff --git a/hw/openrisc/pic_cpu.c b/hw/openrisc/pic_cpu.c
index d3f179ff8d127c10534341b58998b20f545a79ff..36f93508309624915445002680826f8d912b6c8b 100644 (file)
--- a/hw/openrisc/pic_cpu.c
+++ b/hw/openrisc/pic_cpu.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "cpu.h"
 

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 58870e0d87ed6ea2522a9cd7e2bc1e7ad0462b82..30e078763f46f5ee7eb8717e4db43ecd8b883a29 100644 (file)
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -39,7 +39,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"

diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 1a45c30505f43795ff0799fc880db268d32b5743..93f28efb490525ca004c350653c49b3a6f1f52b8 100644 (file)
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -31,7 +31,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/pci-host/gpex.h"
 #include "migration/vmstate.h"

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 9e8c8542d3999dbd66550f6a20a36a905b77cc8a..bc9726057add248ed118d8240ed563b275d6dd2a 100644 (file)
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"

diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 840869f19cb7fd5550291861c928c1ff5a66f53d..241e7e788df81a3d7917abda7e858acf9b8a6eff 100644 (file)
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -15,7 +15,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/e500-ccsr.h"
 #include "migration/vmstate.h"

diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 34a36812ea3ffd8ef3e5a1c78217f47257980471..588c7dc6c09e3e2ee8eb4593539a040ab8235f73 100644 (file)
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -27,7 +27,6 @@
 #include "qemu-common.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 25335a8b71010396b6cc4613c93497acce691688..1688a89b6a196d4e8312ceb087851d3e35368a08 100644 (file)
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -29,7 +29,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci-host/q35.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 4ffb2d0d03d1e1bef9ccda0cf514d7dc48cdb41d..76293ab22b747d430d84e4a702583d84be3b0726 100644 (file)
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/mac.h"
 #include "qemu/module.h"

diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index 81a23accf3848a5a2cda675fd46872ff88220515..29187898f2b9c160c6896178f912aae9eea24652 100644 (file)
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -15,7 +15,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci.h"

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index de3691eee484a9dcc6da98dced007856b29b8358..d84ecd8507a555db31b76009f2b256231fe1f1b7 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index d6768b8eb6c7ae55a6b8b9872b516d7a685db0e5..3534006f993726e6c0306bbb802c2fa13c9bf40a 100644 (file)
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -20,7 +20,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pcie_host.h"
 #include "qemu/module.h"

diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c
index c16b12db01acca49363349d5e3ac5dff7e3d5806..03d13e7d670a77dc71ba085fc32bb4714f8fe5b5 100644 (file)
--- a/hw/pcmcia/pcmcia.c
+++ b/hw/pcmcia/pcmcia.c
@@ -6,7 +6,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/pcmcia.h"
 
 static const TypeInfo pcmcia_card_type_info = {

diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c
index 26ab2267deae04575926b2affaa78a4afc1ebc2a..14e4dfe8b1085e46d6a2cd5870d1edf33733d939 100644 (file)
--- a/hw/pcmcia/pxa2xx.c
+++ b/hw/pcmcia/pxa2xx.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 0451a4e338932272c560afa49060c994537d3f57..3f0c3dea929cf51afc278657480447377fe979a2 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -22,7 +22,6 @@
 #include "e500-ccsr.h"
 #include "net/net.h"
 #include "qemu/config-file.h"
-#include "hw/hw.h"
 #include "hw/char/serial.h"
 #include "hw/pci/pci.h"
 #include "hw/boards.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 0f9f351eb1ffabd790b715d9202f62c8ae15ad73..94a958e5e0af4de94dcfd34d1a092f0a06a60b1a 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -49,7 +49,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/mac.h"
 #include "hw/input/adb.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 664005747308b14c4aaf3b7ff66e5a93a02849ad..aeeddd1d3bfa09b6947416573e50015af5104a63 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -28,7 +28,6 @@
 #include "qemu-common.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "mac.h"
 #include "hw/input/adb.h"

diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index 2b7cc1406007e3e6a4a81c782d127647b623056f..ad9c219a8f1ed88b6a119cd386a05d508c5fd64b 100644 (file)
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 96608883aa36c90609028ccc6f763f27ededecae..114d5826dfda43182ebc710fdac66a9d075b80eb 100644 (file)
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -26,7 +26,6 @@
 #include "sysemu/reset.h"
 #include "sysemu/cpus.h"
 #include "sysemu/device_tree.h"
-#include "hw/hw.h"
 #include "target/ppc/cpu.h"
 #include "qemu/log.h"
 #include "hw/ppc/fdt.h"

diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
index 4b76d34f0a49643475a7f9f65e57ad4d65d7dc54..a27776aa993efb46862b17393d3d631defdef11e 100644 (file)
--- a/hw/ppc/pnv_bmc.c
+++ b/hw/ppc/pnv_bmc.c
@@ -17,7 +17,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "target/ppc/cpu.h"
 #include "qemu/log.h"

diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c
index 636f91f311d4fac944899809970c6922103af248..6120405379eec2253e73e6404ec1adf3d24232c0 100644 (file)
--- a/hw/ppc/pnv_occ.c
+++ b/hw/ppc/pnv_occ.c
@@ -17,7 +17,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "target/ppc/cpu.h"
 #include "qapi/error.h"

diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index e66aeec4aacbc0049e538eef2c68f14ab284ca61..f10d519014478ada75794bc2ab9c7583799064a9 100644 (file)
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "target/ppc/cpu.h"
 #include "qemu/log.h"

diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index 2b81c75f56549d220840b776c1747e6594498c17..0e31c5786b70f27abbdd8c70688b6e0476cc77fc 100644 (file)
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "sysemu/hw_accel.h"

diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index 5cc321828e1101df2c16d385771fbb43c4ec3fe2..a1192d788945daf914b306b16c5f3b20a332b74b 100644 (file)
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc_e500.h"

diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 5b278e77918b2f4fc3ad3403ca3aea599e4081cb..388cae0b43709d7a8f506ef22bca8b8201dc0c9a 100644 (file)
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -27,7 +27,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "ppc405.h"
 #include "hw/timer/m48t59.h"

diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index bb62714fd92fba8b576937b1253ab1cbb5afbe45..ba092f293117456b29c39c1471f1c646afc84801 100644 (file)
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -26,7 +26,6 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "hw/boards.h"
 #include "hw/i2c/ppc4xx_i2c.h"

diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 1bd92aa749f9c34d867de5c42a1544bc46a57e04..4d95c0f8a888305e448f2c5dadf4c4e0ab982e55 100644 (file)
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -17,7 +17,6 @@
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "net/net.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/boards.h"
 #include "sysemu/kvm.h"

diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c
index 77a78388c1c39eb87d14bf9558915172f9802f22..2ee2d4f4fc7a8e164f8b3013cb12d2f21be775c9 100644 (file)
--- a/hw/ppc/ppc440_pcix.c
+++ b/hw/ppc/ppc440_pcix.c
@@ -23,7 +23,6 @@
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"

diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 6570c2d1207766c5b1757ece76ed89c6efa488d4..e7f42d78a1d18930f0055f284ab285f26309edb3 100644 (file)
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -15,7 +15,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "exec/address-spaces.h"
 #include "exec/memory.h"

diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 49d714756f51a36328403edb2f077a1cf996bf55..c2e50138aa630912a04d438e6e7d6c9cbafcee51 100644 (file)
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -26,7 +26,6 @@
 #include "qemu/units.h"
 #include "sysemu/reset.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"

diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 7334d75890614ba549cbd79eb1dfc887099c866c..3ea47df71fe39a68ac971a0022f259712be408a3 100644 (file)
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -20,7 +20,6 @@
  * 4xx SoCs, such as the 440EP. */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"

diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
index ba5f513ca5ba9e2d92893b7d97fe9de7bab17446..ce0e1406e109aca8d1a42653964d7ce02eda59bc 100644 (file)
--- a/hw/ppc/ppc_booke.c
+++ b/hw/ppc/ppc_booke.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "qemu/timer.h"
 #include "sysemu/reset.h"

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 01dc7e111bfee212dbb2806c379ce184ee8bc075..4f3c6bf1901827796d1586d69c1ac843bc4fa6da 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/timer/m48t59.h"
 #include "hw/char/serial.h"
 #include "hw/block/fdc.h"

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index c1d6f74d5b3f2e5acfc4887336bb821e6a0f2903..7ed5518dbcf448befdac9623ebc28b2227641012 100644 (file)
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -16,7 +16,6 @@
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7030a752265d50d0658af87b87378eed4c36af69..0258ca086f28131824669f69aec0caed2397a0f6 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -32,7 +32,6 @@
 #include "sysemu/numa.h"
 #include "sysemu/qtest.h"
 #include "sysemu/reset.h"
-#include "hw/hw.h"
 #include "qemu/log.h"
 #include "hw/fw-path-provider.h"
 #include "elf.h"

diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index 57834e6a390b109d781e531a5510a8195ca30dce..8223bdb39f32ea50daf44fd9c03226d5181b9d3c 100644 (file)
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/hw.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "sysemu/kvm.h"

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index e5f592322f66c2671c03fc1d01fbd0ee67150aea..53b799fec723c92f924167b1f0f854f53204ca1d 100644 (file)
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 1095aa5f00e82fa5129cc7d57837caf2f4bcaebc..31ff0be189af0bbc674dc5cef5659ea5863a9b48 100644 (file)
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -23,7 +23,6 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 06f5a28601176da46f0be52f716e46f8677a407e..099b94cc541b80a2d3cb1e620af88f861f821f1f 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -27,7 +27,6 @@
 #include "qemu/units.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/char/serial.h"
 #include "hw/block/flash.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index 8d70c0d23de4474d93738bb554beef215d3a4f09..692125ac26815fc0d9180e69adbf43835385cd9c 100644 (file)
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -15,7 +15,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_ids.h"
 

diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
index adcf79cd6302504d6073109a8cb04c50f10a6e43..b924843367d7dba157aed1c076d7e17a7e061d77 100644 (file)
--- a/hw/rdma/vmw/pvrdma_main.c
+++ b/hw/rdma/vmw/pvrdma_main.c
@@ -16,7 +16,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"

diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 2a499d8ed29f82d606ba493049271a30bebaca23..862903d6b5b03f19d2cdd99a68dfdd72142bda43 100644 (file)
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -32,7 +32,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"

diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c
index f406682c91f173aca0c072f687aa4826503f931a..562bc3dc4ce7c8e8389e5e66504a073d25e2cc70 100644 (file)
--- a/hw/riscv/sifive_prci.c
+++ b/hw/riscv/sifive_prci.c
@@ -22,6 +22,7 @@
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "target/riscv/cpu.h"
+#include "hw/hw.h"
 #include "hw/riscv/sifive_prci.h"
 
 static uint64_t sifive_prci_read(void *opaque, hwaddr addr, unsigned int size)

diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c
index 24a04d7b3697968c573655cf9306b91de2938a97..3a14f9f8b6b11b6dffb7a70be32999a5317d414d 100644 (file)
--- a/hw/riscv/sifive_test.c
+++ b/hw/riscv/sifive_test.c
@@ -22,6 +22,7 @@
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "target/riscv/cpu.h"
+#include "hw/hw.h"
 #include "hw/riscv/sifive_test.h"
 
 static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)

diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 71b8083c05ed9173b6e86b0a46c7788a80e1a18b..0b3c5dff97219ce7120eab5c821493181eeaa85f 100644 (file)
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -29,7 +29,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"

diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c
index d18613fb330b70ad0bb071c9bf582fc957761ad9..9de42b16807ab6afc39bb3e2ce41258775bff0b0 100644 (file)
--- a/hw/riscv/sifive_uart.c
+++ b/hw/riscv/sifive_uart.c
@@ -22,6 +22,7 @@
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
 #include "target/riscv/cpu.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/riscv/sifive_uart.h"
 

diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 2991b341a2b41c6ddec891353f71eed8096526d4..9cc786b6b6f21946800aab174a32e75e1d354ac7 100644 (file)
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -27,7 +27,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"

diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 25faf3b4178c38702b033784d1f3f2abe6afcb3e..c72198b72014646bba94e01782059de18f0e055d 100644 (file)
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -23,7 +23,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index fa537bfba3518d87d2ea7c2d8f893181b9dbb22f..a371370221f7a812a43ac1f7c1338b69f6c0ed2a 100644 (file)
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "net/net.h"

diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index 175eb792606e38d02d13ac10fac3297373afd8f8..222a286d44098390e13704d5c8b8cd6d5c11f226 100644 (file)
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -15,7 +15,6 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
 #include "hw/scsi/scsi.h"

diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 970b10048f98b9f557b0b109cf7e5bd6eeed0528..3706294a852c6610c0f395b6f9fc857ff8db6e0d 100644 (file)
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/scsi/mptconfig.c b/hw/scsi/mptconfig.c
index 87a416a5cb5cbb808449c77ba8a505f7b82513b5..3b2a857b5c1460bfc928f82da9de5f1d0cc4b65e 100644 (file)
--- a/hw/scsi/mptconfig.c
+++ b/hw/scsi/mptconfig.c
@@ -16,7 +16,6 @@
  * Lesser General Public License for more details.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/scsi/scsi.h"
 

diff --git a/hw/scsi/mptendian.c b/hw/scsi/mptendian.c
index 79f99734d2125a02525a24a4160bfe2fc28834ab..313f40edf9ae8435cf7759a4bd61458e3fdc9469 100644 (file)
--- a/hw/scsi/mptendian.c
+++ b/hw/scsi/mptendian.c
@@ -21,7 +21,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"
 #include "hw/pci/msi.h"

diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index 79501777d48de1bfdae8dc1e158352dadc88736a..b32f4c0ca9b01253427475604bc6d4146370816a 100644 (file)
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"
 #include "hw/pci/msi.h"

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 42928a6aec80b64825a9f0bb08ed6f8c1ba54d85..1f9914739ae021b736c496fca08d51aa0db016b3 100644 (file)
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index 5290f7569a29f4c4f6152fa38efc7d9375c4a64f..fedeec676d1838d9a2b7c8bae5eaa2f2dade9555 100644 (file)
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -35,7 +35,6 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/scsi/scsi.h"
 #include "migration/vmstate.h"
 #include "scsi/constants.h"

diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index dcb71691661dd5b231bbaaa2e8c8ac69530fb747..e3c7cf5b5f0f9c58c38f141011e86916167bf7e2 100644 (file)
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 15a0bbe87dc9df49954ab86baea72f4b125ebfe6..c6e516b611306562ba4a405fe66c852ad963eac2 100644 (file)
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -21,7 +21,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/arm/omap.h"
 #include "hw/sd/sd.h"

diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index 020cd5464cf6c161124bc28584cfa1364e38395d..db2f2adf584a4d79244f29d42eb91ea5dc61c218 100644 (file)
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 02924329bf4dfe8e09a1b81b4f22ab36ac8b11f8..3f26b3878647eb54652d83b6606cf5c8a95903fa 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -33,7 +33,6 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/qdev.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/registerfields.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
index 9370181993f116f1b76162bd49df7be64b109ba0..438cb30af58256760cb363fb9e5b7e3dcdd28735 100644 (file)
--- a/hw/sd/sdhci-pci.c
+++ b/hw/sd/sdhci-pci.c
@@ -18,7 +18,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/sd/sdhci.h"
 #include "sdhci-internal.h"
 

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index f9db39c83485019f3288847b9efb821398e4c424..1adc16e3e90541ca2ad186a1ff8798def95706b2 100644 (file)
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -26,7 +26,6 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "sysemu/dma.h"
 #include "qemu/timer.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 9838ea3323eebdcab5e5747ec1c3a07db67d8fc2..571e59430440e653b5d24e03760ab7df0def9dc9 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -28,7 +28,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/reset.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index b35d07265d1dd96b9e7178320fa4416453cb9129..d660714443e3623e769f444c8ca80475048ed9a5 100644 (file)
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c
index 34b4f99b86aeefd77285a451b5856f663b7b854a..0630fe3cf4a776336585a33a381310d26eb46517 100644 (file)
--- a/hw/sh4/sh7750_regnames.c
+++ b/hw/sh4/sh7750_regnames.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sh7750_regs.h"
 #include "sh7750_regnames.h"

diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 6a1c7238e90a431cb7f8fbd215157d60a153dc9c..2fc29154287168364de2f0e82496697bc8a722af 100644 (file)
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -30,7 +30,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 9c43806690bb0019e1b9d8e478caab0754a4969b..655939a3f1d2c84b183af0abec73a64d5368af10 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -28,7 +28,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index dc0ce7eda47ed3243d39ac2140ce048b47063ff1..1efcff628a41856ec47faf63e330afc53f1488cb 100644 (file)
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/char/serial.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index c95ed94d2e16d79d577f7c9709a15583abedbfce..54a385970cca6ce8181522964c8902c8483c821b 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -28,7 +28,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index b310dfb1b30fd0525222f9df4d3c2496f2cb49ab..0339b92cf8d40f07cb14071785f6d46eb56e06a1 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -21,6 +21,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/timer/a9gtimer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index a13255d308b39d030b09d5e658178c120d57a8ed..abfc5baa7715ea36bcebaa6e323fc88b92f238e9 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
 #include "hw/timer/arm_mptimer.h"

diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index 7f2af5287c0ad518d02252146fa5910d75e75a24..79b291863c7840bc5ae62fee2019f7efd7fceade 100644 (file)
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -62,6 +62,7 @@
 #include "hw/ptimer.h"
 
 #include "hw/arm/exynos4210.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 
 //#define DEBUG_MCT

diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index 561451059ea3a46f2636c3b7860782c91c7ed629..f79b970c5e1f618f7ecdd47bc46c6d88f109fbdd 100644 (file)
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -35,7 +35,6 @@
 #include "qemu/bcd.h"
 #include "hw/ptimer.h"
 
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 305704a33975adb00ba8c6092bf780ff3e0f6425..1ddae4e7d7dcf69d88b45cf1e52231acdaa08d64 100644 (file)
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"
 #include "ui/console.h"

diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 97258757b16d198cd2fa4e8c90fe81153c74edfb..a4be7330ef73e4cf4320882d501d3051b9cd2a65 100644 (file)
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
index 062e8690c4bb668fc058124080f83ea995db0f5f..57bf10cc942586d1b4e341c2aa46f20afd65172c 100644 (file)
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index bfa9de76ba14d560d036e0c3b24fc7ce84862c41..a381e39f0a6f6ea50afeb74843da4e1e63be6ae3 100644 (file)
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -22,7 +22,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 1240315206e89e75aedc7fb9f3d28f3624a03397..199003030a6fb8ce756bbde556d953278f28f6aa 100644 (file)
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/timer/m48t59.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index b432662bc49119a9d90ba1b280d23d556291eb5b..473935339d28dfd02dbf1a46a40f795e6a980e3d 100644 (file)
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -27,7 +27,6 @@
 #include "qemu/cutils.h"
 #include "qemu/module.h"
 #include "qemu/bcd.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c
index 7c5622471068e102e94c916a8835146d83e24de0..900b0b62a9be4ec13880dcf9613e01cdf8a2bf25 100644 (file)
--- a/hw/timer/milkymist-sysctl.c
+++ b/hw/timer/milkymist-sysctl.c
@@ -22,7 +22,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/mips_gictimer.c b/hw/timer/mips_gictimer.c
index f5c580672480fdd672dd93d1db4b10066ebff5e3..bc44cd934e85a23789f3178c1fed70fb98e0c010 100644 (file)
--- a/hw/timer/mips_gictimer.c
+++ b/hw/timer/mips_gictimer.c
@@ -7,7 +7,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/timer/mips_gictimer.h"

diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
index c34f60b5d4175339c3b0eb5e13c6d35ccd862d7b..c407190138c7b9615f178d0a758c8f27cc3b19ea 100644 (file)
--- a/hw/timer/omap_gptimer.c
+++ b/hw/timer/omap_gptimer.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/timer.h"
 #include "hw/arm/omap.h"

diff --git a/hw/timer/omap_synctimer.c b/hw/timer/omap_synctimer.c
index 0d75a90f3a9f0208113d341328081c5b00291e3c..72b997939bda984af0cd8efe108ad499a253cfb8 100644 (file)
--- a/hw/timer/omap_synctimer.c
+++ b/hw/timer/omap_synctimer.c
@@ -18,7 +18,6 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/arm/omap.h"
 struct omap_synctimer_s {

diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index f61053b3c68cd1876776e92bfa1b0c446708acf6..99e6c1e250ba05e92d329e2326c3ba3a0aac9cf5 100644 (file)
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c
index ba62adc82625e36340bc1415f6cd6cdec29ef59a..54272a822fdf090703fb8e0f85d125bbc61771d0 100644 (file)
--- a/hw/timer/sun4v-rtc.c
+++ b/hw/timer/sun4v-rtc.c
@@ -10,7 +10,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index 6b2a25b9c9316c7e35c4fd36b1b229b9823e9967..63bd13d2caa44609dadb24e26fa41ca9c4781f23 100644 (file)
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -21,7 +21,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"

diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index 76c1e16fa1c61a040421adc948e96cdf71dd7028..22f9113432c86910a34df083a0de9267bbcac2a3 100644 (file)
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -33,7 +33,6 @@
 #include "io/channel-socket.h"
 #include "sysemu/tpm_backend.h"
 #include "tpm_int.h"
-#include "hw/hw.h"
 #include "tpm_util.h"
 #include "tpm_ioctl.h"
 #include "migration/blocker.h"

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 897e3d5864c1e677b398d5a23a4ea2710d4fd28a..f67244b5d4fc260e25afb871156dbbed95dc1a5f 100644 (file)
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -29,7 +29,6 @@
 #include "qemu/sockets.h"
 #include "sysemu/tpm_backend.h"
 #include "tpm_int.h"
-#include "hw/hw.h"
 #include "qapi/clone-visitor.h"
 #include "qapi/qapi-visit-tpm.h"
 #include "tpm_util.h"

diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index be397ebf92d62fbb355d404cd0e84b6d6793fdc4..c6305dcdf1a368eb44ebb718320fda97a81f3de6 100644 (file)
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -22,7 +22,6 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 6aff15e5048f1eaec79ac168f2bc80716300de68..be18221ac6426ecd820ca6ccbe8f7b318a7ba48f 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/qdev.h"
 #include "qapi/error.h"

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index d4074edfc36deb2d9c7a5d95e3bc580b8b804218..c0f35c58d503a4007e4d0273fd47b374e682c4c7 100644 (file)
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -34,7 +34,6 @@
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
-#include "hw/hw.h"
 #include "audio/audio.h"
 
 #define USBAUDIO_VENDOR_NUM     0x46f4 /* CRC16() of "QEMU" */

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index c7c65a87826c00952333823b71faceb710f428e9..79b3be3c3fea9b7d5fa85ab61bf15ac2e11340d7 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/usb.h"
 #include "migration/vmstate.h"

diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index 9a8a2d3081c98d7edb20a912400c1a857419e63f..8ed57b3b44444ad0e07e65ae0929b449bbd8e41e 100644 (file)
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -27,7 +27,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/usb.h"
 #include "migration/vmstate.h"

diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index fedf82c611c94a5ea2a9dee272bde5f423c763a7..fdbcfdcbeb9202a283b3f3f693c9cbc20a0af0b0 100644 (file)
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -18,7 +18,6 @@
 #ifndef HW_USB_HCD_EHCI_H
 #define HW_USB_HCD_EHCI_H
 
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "sysemu/dma.h"

diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
index 67fcfc4d7c3f6c3156e6848391c1aea678dca934..25b0ced8045d467be7cda161b54b3c8d33160347 100644 (file)
--- a/hw/usb/hcd-ohci-pci.c
+++ b/hw/usb/hcd-ohci-pci.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 438dfb4b839d6f296127319ec5f2cc86654de394..94b3410d3c55a78e4554ba4aa29f6a90f424e52c 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -26,7 +26,6 @@
 */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 887885efa0f51fb08d650b0b31d95979dcb0ed11..7c6edd17b4e5ba0775baa8f8e05587769051e7aa 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -27,7 +27,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/usb/uhci-regs.h"
 #include "migration/vmstate.h"

diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c
index e099382b24a5ea9f41c15ff2e85a181f442497b4..aba3716875d32cbcb60447896786dd41621b005f 100644 (file)
--- a/hw/usb/hcd-xhci-nec.c
+++ b/hw/usb/hcd-xhci-nec.c
@@ -20,7 +20,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/usb.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index fc6747610024dc5cef04ca1ba3dc1fb01473560b..d60ad895a39f62056483e6bda1bc35fbf4b87edb 100644 (file)
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -20,7 +20,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "qemu/module.h"
 #include "qemu/queue.h"

diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index adbee2f642e16549e5612f0133a3748e1b8071f3..9c33a1640f7ff21bef07ae5f97b52f8c5df6748e 100644 (file)
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -20,7 +20,6 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/usb.h"
 #include "sysemu/dma.h"
 

diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c
index a61b0f6354932d072f350bdaac67dc2bf38c11a2..17580876c682361cd7266d85677783432be00455 100644 (file)
--- a/hw/usb/tusb6010.c
+++ b/hw/usb/tusb6010.c
@@ -24,6 +24,7 @@
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "hw/arm/omap.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 

diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index b35a640030ca7dbb09784dc1ec4daef742b026c7..62d765a4eaed0491d9416e6148aec5e8f50d1a1d 100644 (file)
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -19,6 +19,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include <sys/ioctl.h>
+#include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
 #include "pci.h"
 #include "trace.h"

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 8a58ad670ce5e1a17f7dec04f024cf5e35d341ca..48ac0f5a3417cc54618773d5e388595009ad917f 100644 (file)
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -22,6 +22,7 @@
 #include <linux/vfio.h>
 #include <sys/ioctl.h>
 
+#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index ba1006ad964dddcd22da308764e298f9ec95a49e..34accdf6153d15d105e709a5dd931a3ff47a742a 100644 (file)
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -16,7 +16,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/virtio/vhost.h"
-#include "hw/hw.h"
 #include "qemu/atomic.h"
 #include "qemu/range.h"
 #include "qemu/error-report.h"

diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 1d29a631f3a61482538e84c3f67609225ca908ed..207e9559965f992ffa538aa67a889832821be8a4 100644 (file)
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index 288be8f73cc27fdd2a05fcee614a020b61749f83..370cf92e856368b4d4331ffcd46b08922cfa8170 100644 (file)
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -24,7 +24,6 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "sysemu/watchdog.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index e233945c2e05c4bb1b902bc1e66d427c1ff5b45a..985944a84a6c78d5a4e051ce782709e91e2bd6df 100644 (file)
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -23,7 +23,6 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "sysemu/watchdog.h"
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/xen/xen-bus-helper.c b/hw/xen/xen-bus-helper.c
index 5f7a4b2612770ac0701fdfcb513a1a7d56e0f619..b459bb93968022de83422aa46d0d1055966ef8cd 100644 (file)
--- a/hw/xen/xen-bus-helper.c
+++ b/hw/xen/xen-bus-helper.c
@@ -6,7 +6,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/xen/xen-bus.h"

diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index 7503eea9e9ac9fffc3f930c1791724c36ad19c90..3f39a894dac64d0952e90d63e289f46fad79a3fe 100644 (file)
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -9,7 +9,6 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/uuid.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/xen/xen-backend.h"

diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 3715c94fa6eed7d026016da3dccae645154e44f6..2831940ae78c08f8034ceb4c015fd37bd10ce36e 100644 (file)
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include <sys/signal.h>
 
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/boards.h"
 #include "qemu/log.h"

diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c
index e6a86ca818026d71109c55afe017cce918fdbbc4..d111ecaf7ecbde0be216a3dab9378a9c76b7d992 100644 (file)
--- a/hw/xen/xen_pt_load_rom.c
+++ b/hw/xen/xen_pt_load_rom.c
@@ -3,7 +3,6 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"

diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index dcaf2a01a321241f66712930d9fe361435f585cd..524d608eab2015567907945411ee5504d19e5855 100644 (file)
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/xen/xen-legacy-backend.h"
 #include "hw/xen/xen-bus.h"

diff --git a/hw/xtensa/mx_pic.c b/hw/xtensa/mx_pic.c
index 912de662066750e9fb431ad6bf15599ba0d78d1c..d889f953d17e6b04f43bf11159cc5c484bfb905a 100644 (file)
--- a/hw/xtensa/mx_pic.c
+++ b/hw/xtensa/mx_pic.c
@@ -26,7 +26,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/xtensa/mx_pic.h"
 #include "qemu/log.h"

diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c
index b708290d7bfe7e5b0df3ebab2dc9a0013476ec77..edd53c9241c5adef0ad5b50b8f21e14720d07649 100644 (file)
--- a/hw/xtensa/pic_cpu.c
+++ b/hw/xtensa/pic_cpu.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "qemu/log.h"
 #include "qemu/timer.h"

diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h
index 172afbf1461ad3859133ac59c9375e73762588bf..0f5d4f99193d06c21111502a549e715b97d50bd3 100644 (file)
--- a/include/hw/audio/pcspk.h
+++ b/include/hw/audio/pcspk.h
@@ -25,7 +25,6 @@
 #ifndef HW_PCSPK_H
 #define HW_PCSPK_H
 
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 
 #define TYPE_PC_SPEAKER "isa-pcspk"

diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h
index e12cb886d16b7be10eed36cfeace58556bc629a7..f7bafd5e3844d7bf6c2aa77bf9e1ebf3bf7d315b 100644 (file)
--- a/include/hw/audio/wm8750.h
+++ b/include/hw/audio/wm8750.h
@@ -14,7 +14,6 @@
 #ifndef HW_DAC_WM8750_H
 #define HW_DAC_WM8750_H
 
-#include "hw/hw.h"
 
 #define TYPE_WM8750 "wm8750"
 #define TYPE_MV88W8618_AUDIO "mv88w8618_audio"

diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index abd5cf71a9146797cb1b83ffc0322b1fdd34aba8..bfcbbb6e197711c078290fa7fe8b9356baa48d9a 100644 (file)
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -26,7 +26,6 @@
 #ifndef HW_SERIAL_H
 #define HW_SERIAL_H
 
-#include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "chardev/char-fe.h"
 #include "exec/memory.h"

diff --git a/include/hw/char/stm32f2xx_usart.h b/include/hw/char/stm32f2xx_usart.h
index 84c40297777d24b1206b5b8d13043c4ecd8f2c18..8e112671e3c1a6bfb66f3956225d1a380a977b0d 100644 (file)
--- a/include/hw/char/stm32f2xx_usart.h
+++ b/include/hw/char/stm32f2xx_usart.h
@@ -27,7 +27,6 @@
 
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
-#include "hw/hw.h"
 
 #define USART_SR   0x00
 #define USART_DR   0x04

diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h
index 2cab50bb6c28c2aabc78390473ade0020630f1f8..03e2c166be72a677c5e97821ead8496da4000e25 100644 (file)
--- a/include/hw/dma/i8257.h
+++ b/include/hw/dma/i8257.h
@@ -1,7 +1,6 @@
 #ifndef HW_I8257_H
 #define HW_I8257_H
 
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "exec/ioport.h"
 

diff --git a/include/hw/hw.h b/include/hw/hw.h
index 8079b911fa784bf3e19bcfee68467e7af5b43f50..fc5301f29372e699c7bcd0767ca008af47679c74 100644 (file)
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -1,4 +1,3 @@
-/* Declarations for use by hardware emulation.  */
 #ifndef QEMU_HW_H
 #define QEMU_HW_H
 

diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
index 046bcf33bedba1a80579757286aed7c15732b21a..72e803f6e2e0eb637986e658805e2b3d70c4b7ef 100644 (file)
--- a/include/hw/i386/ich9.h
+++ b/include/hw/i386/ich9.h
@@ -1,7 +1,6 @@
 #ifndef HW_ICH9_H
 #define HW_ICH9_H
 
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "hw/sysbus.h"
 #include "hw/i386/pc.h"

diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
index 3d2eec2aa77ca39f779fb1d92202fd1671de5868..d46c87c510305bb4723691b7f40f551ea69b265c 100644 (file)
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -22,7 +22,6 @@
 #ifndef QEMU_IOAPIC_INTERNAL_H
 #define QEMU_IOAPIC_INTERNAL_H
 
-#include "hw/hw.h"
 #include "exec/memory.h"
 #include "hw/i386/ioapic.h"
 #include "hw/sysbus.h"

diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index f6ff146364a6497ee37730b5f8f9ccefe1135ab7..246e6f3335aa454756291297b9c1ad1ea99939b4 100644 (file)
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -8,7 +8,6 @@
 #ifndef HW_INPUT_I8042_H
 #define HW_INPUT_I8042_H
 
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 
 #define TYPE_I8042 "i8042"

diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
index 0f93602936d36245bb79c00e55664e4e9541411d..b6e070c00e9be93bed5bdfcf67b0c903d5e98a6c 100644 (file)
--- a/include/hw/isa/apm.h
+++ b/include/hw/isa/apm.h
@@ -1,7 +1,6 @@
 #ifndef APM_H
 #define APM_H
 
-#include "hw/hw.h"
 #include "exec/memory.h"
 
 #define APM_CNT_IOPORT  0xb2

diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h
index f742c2a72608cf8d1a7219b67975427c679fb58a..ee189e4a7796320a7691e83372d44599d8caedea 100644 (file)
--- a/include/hw/isa/i8259_internal.h
+++ b/include/hw/isa/i8259_internal.h
@@ -25,7 +25,6 @@
 #ifndef QEMU_I8259_INTERNAL_H
 #define QEMU_I8259_INTERNAL_H
 
-#include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "hw/intc/intc.h"

diff --git a/include/hw/misc/stm32f2xx_syscfg.h b/include/hw/misc/stm32f2xx_syscfg.h
index 69e6a30fc57090982800c82def40ac2f31de2e76..84e06fdecf06fe212a692b6a20ae508e76f485a0 100644 (file)
--- a/include/hw/misc/stm32f2xx_syscfg.h
+++ b/include/hw/misc/stm32f2xx_syscfg.h
@@ -26,7 +26,6 @@
 #define HW_STM32F2XX_SYSCFG_H
 
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 
 #define SYSCFG_MEMRMP  0x00
 #define SYSCFG_PMC     0x04

diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index 5acf4a494e676c7376b3c4f6c436f8f6d5fcd39e..1233928a347ce22eadc6dc619775ddbcb61daafc 100644 (file)
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -10,7 +10,6 @@
 #ifndef HW_NET_NE2000_ISA_H
 #define HW_NET_NE2000_ISA_H
 
-#include "hw/hw.h"
 #include "hw/qdev.h"
 #include "hw/isa/isa.h"
 #include "net/net.h"

diff --git a/include/hw/pci-host/designware.h b/include/hw/pci-host/designware.h
index 186bb36238c15348854d7929b40111edd185f2ae..31c41231b14e704868c8fb5173a6fdbed8e678d0 100644 (file)
--- a/include/hw/pci-host/designware.h
+++ b/include/hw/pci-host/designware.h
@@ -21,7 +21,6 @@
 #ifndef DESIGNWARE_H
 #define DESIGNWARE_H
 
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"

diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h
index 2af1c4a37e8946a543656507e9a369da19073c5a..faea040a9347f6e2ee7db9295070b0e0c6b906a4 100644 (file)
--- a/include/hw/pci-host/gpex.h
+++ b/include/hw/pci-host/gpex.h
@@ -20,7 +20,6 @@
 #ifndef HW_GPEX_H
 #define HW_GPEX_H
 
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pcie_host.h"

diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index 5ed77facd08242cd80422584826320c5859cb5f4..b3bcf2e63278d4ddb57ea3ca120d930d149bae4e 100644 (file)
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -22,7 +22,6 @@
 #ifndef HW_Q35_H
 #define HW_Q35_H
 
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "hw/sysbus.h"
 #include "hw/i386/pc.h"

diff --git a/include/hw/pci-host/uninorth.h b/include/hw/pci-host/uninorth.h
index 9a5cabd4c597630b561862901cd6bcec3f80c902..72d2a97355195f35690388c3d5de1ad5ae754949 100644 (file)
--- a/include/hw/pci-host/uninorth.h
+++ b/include/hw/pci-host/uninorth.h
@@ -25,7 +25,6 @@
 #ifndef UNINORTH_H
 #define UNINORTH_H
 
-#include "hw/hw.h"
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/openpic.h"
 

diff --git a/include/hw/pci-host/xilinx-pcie.h b/include/hw/pci-host/xilinx-pcie.h
index 74c04dc9bb81403d3fd0587f78e00911f0a936fd..c0f15314be2b73b22a106ce082d56fc4a4ec779e 100644 (file)
--- a/include/hw/pci-host/xilinx-pcie.h
+++ b/include/hw/pci-host/xilinx-pcie.h
@@ -20,7 +20,6 @@
 #ifndef HW_XILINX_PCIE_H
 #define HW_XILINX_PCIE_H
 
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 8cf3361fc4f3b883c86ff59b9e6aa098349bbc6e..7064875835995d3a80a6faffc4385ff92bc6bfb9 100644 (file)
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -21,7 +21,6 @@
 #ifndef QEMU_PCIE_H
 #define QEMU_PCIE_H
 
-#include "hw/hw.h"
 #include "hw/pci/pci_regs.h"
 #include "hw/pci/pcie_regs.h"
 #include "hw/pci/pcie_aer.h"

diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h
index 502dcd7eba04b1b4c05b9254840b741a30d07d65..65e71d98febd57b9f3d47db201743036ee0188d8 100644 (file)
--- a/include/hw/pci/pcie_aer.h
+++ b/include/hw/pci/pcie_aer.h
@@ -21,7 +21,6 @@
 #ifndef QEMU_PCIE_AER_H
 #define QEMU_PCIE_AER_H
 
-#include "hw/hw.h"
 #include "hw/pci/pci_regs.h"
 
 /* definitions which PCIExpressDevice uses */

diff --git a/include/hw/qdev.h b/include/hw/qdev.h
index 5cb8b080a623202d9fdddc02a0f9443c5aeb5b19..d68991ae87e8a9f6fc070a072abc4e7ad115eeb8 100644 (file)
--- a/include/hw/qdev.h
+++ b/include/hw/qdev.h
@@ -1,7 +1,6 @@
 #ifndef QDEV_H
 #define QDEV_H
 
-#include "hw/hw.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 

diff --git a/include/hw/riscv/riscv_htif.h b/include/hw/riscv/riscv_htif.h
index fb5f88129e99b84058491d5a66b6576e1d8630f6..aabc059f3205ba08f7eb78ae70c625c45a330c56 100644 (file)
--- a/include/hw/riscv/riscv_htif.h
+++ b/include/hw/riscv/riscv_htif.h
@@ -20,7 +20,6 @@
 #ifndef HW_RISCV_HTIF_H
 #define HW_RISCV_HTIF_H
 
-#include "hw/hw.h"
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
 #include "sysemu/sysemu.h"

diff --git a/include/hw/ssi/stm32f2xx_spi.h b/include/hw/ssi/stm32f2xx_spi.h
index 1cd73e4cd41ea9825c7e31edecd4fabdd5633a79..e24b007abfadcdbe76d8deb2076ea03b67ff53fa 100644 (file)
--- a/include/hw/ssi/stm32f2xx_spi.h
+++ b/include/hw/ssi/stm32f2xx_spi.h
@@ -26,7 +26,6 @@
 #define HW_STM32F2XX_SPI_H
 
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "hw/ssi/ssi.h"
 
 #define STM_SPI_CR1     0x00

diff --git a/include/hw/timer/aspeed_rtc.h b/include/hw/timer/aspeed_rtc.h
index 1f1155a676c112ee999a07e1f597c5cfdc2e4719..15ba42912b7fc4a1447c0b748e9f11a44b8ed291 100644 (file)
--- a/include/hw/timer/aspeed_rtc.h
+++ b/include/hw/timer/aspeed_rtc.h
@@ -10,7 +10,6 @@
 
 #include <stdint.h>
 
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 

diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h
index 5b12eb918eaa613b57fbf276f9917efcbf82b75c..608b116fcf99542a7275d67f08c1eceef9efe9f7 100644 (file)
--- a/include/hw/timer/i8254.h
+++ b/include/hw/timer/i8254.h
@@ -25,7 +25,6 @@
 #ifndef HW_I8254_H
 #define HW_I8254_H
 
-#include "hw/hw.h"
 #include "hw/qdev.h"
 #include "hw/isa/isa.h"
 

diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h
index e611c6f227bf9ee430b1973954ee7ade17018903..3db462aecd4b948b581cac344253b592145b055a 100644 (file)
--- a/include/hw/timer/i8254_internal.h
+++ b/include/hw/timer/i8254_internal.h
@@ -25,7 +25,6 @@
 #ifndef QEMU_I8254_INTERNAL_H
 #define QEMU_I8254_INTERNAL_H
 
-#include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "hw/timer/i8254.h"
 #include "qemu/timer.h"

diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 619498c8f4a2e9e8d6a07f22ca9158b29b9d8386..085450c6f84064447444f71e905644ddd19138dc 100644 (file)
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -1,7 +1,6 @@
 #ifndef VHOST_H
 #define VHOST_H
 
-#include "hw/hw.h"
 #include "hw/virtio/vhost-backend.h"
 #include "hw/virtio/virtio.h"
 #include "exec/memory.h"

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index e6a2a0a6e061254087aead6a1f2773ac0c905c06..7bae09e3ae314da81cfb8f992bdc17d21f425cb1 100644 (file)
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -15,7 +15,6 @@
 #define QEMU_VIRTIO_H
 
 #include "exec/memory.h"
-#include "hw/hw.h"
 #include "net/net.h"
 #include "hw/qdev.h"
 #include "sysemu/sysemu.h"

diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 0504b4365946d42c025af180ce7db8bb02f30548..1e3ec4e16eed49dd40757757a90942f4e434c6c4 100644 (file)
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -14,7 +14,6 @@
 #include <xenstore.h>
 #include "hw/xen/interface/io/xenbus.h"
 
-#include "hw/hw.h"
 #include "hw/xen/xen.h"
 #include "hw/pci/pci.h"
 #include "qemu/queue.h"

diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index 5da3c4e3c5beb5a4bd7d6a36017b04f4808e3bc7..80c5bc3e02d12880166f08f06968e1e5a07a2b14 100644 (file)
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -12,7 +12,6 @@
 
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
-#include "hw/hw.h"
 #include "block/block.h"
 #include "block/accounting.h"
 

diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h
index f005995c50d81201c92ab2b9a451bef423be04e5..9b27e65cc70ec14c5422b9e7c68f79a7e640312b 100644 (file)
--- a/include/sysemu/hax.h
+++ b/include/sysemu/hax.h
@@ -37,7 +37,6 @@ void hax_cpu_synchronize_pre_loadvm(CPUState *cpu);
 
 int hax_enabled(void);
 
-#include "hw/hw.h"
 #include "qemu/bitops.h"
 #include "exec/memory.h"
 int hax_vcpu_destroy(CPUState *cpu);

diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
index dd1722f2df42e3f2e6aefb9f3a711881d34cee86..d211e808e9dfecbfcd099e41d091898e6a0c25a2 100644 (file)
--- a/include/sysemu/hvf.h
+++ b/include/sysemu/hvf.h
@@ -24,7 +24,6 @@ extern bool hvf_allowed;
 #include <Hypervisor/hv_vmx.h>
 #include <Hypervisor/hv_error.h>
 #include "target/i386/cpu.h"
-#include "hw/hw.h"
 uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
                                  int reg);
 #define hvf_enabled() (hvf_allowed)

diff --git a/monitor/misc.c b/monitor/misc.c
index 00338c002a677eb9815d2c563d4a86ccb978dc33..117a1729284ce2b3b0148000e0d49c3de3fe6acc 100644 (file)
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "monitor-internal.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "monitor/qdev.h"
 #include "hw/usb.h"
 #include "hw/pci/pci.h"

diff --git a/target/alpha/machine.c b/target/alpha/machine.c
index fdab59643894f8a806bb2715e5a1fad82f6e2886..b26ec29f0fc051e74158d17c0d0b55fead10bb96 100644 (file)
--- a/target/alpha/machine.c
+++ b/target/alpha/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "migration/cpu.h"
 

diff --git a/target/arm/machine.c b/target/arm/machine.c
index 3fd319a309151683e95264362888f85ce636dd7f..bf2a0a6a09e1ced41e7689d25161bf1c85e4eda5 100644 (file)
--- a/target/arm/machine.c
+++ b/target/arm/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"
 #include "sysemu/kvm.h"

diff --git a/target/cris/machine.c b/target/cris/machine.c
index ecec41c2c87687a2424cbf50688e9520ab90aebe..be38a89377a4609dad071a77c00be046dc7d63cb 100644 (file)
--- a/target/cris/machine.c
+++ b/target/cris/machine.c
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "migration/cpu.h"
 
 static const VMStateDescription vmstate_tlbset = {

diff --git a/target/hppa/machine.c b/target/hppa/machine.c
index 73e8121bdef7ce19ae8bfd53b53fa245dac1e8e1..9fb82a53db7ff93e79b6375c9f8323f3dddad7f3 100644 (file)
--- a/target/hppa/machine.c
+++ b/target/hppa/machine.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "migration/cpu.h"
 

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 80f144311017704c832987644caa956ce1d12190..ff65e11008ab45a23461fabe6fa00af96f06227c 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -54,7 +54,6 @@
 #include "hw/i386/topology.h"
 #ifndef CONFIG_USER_ONLY
 #include "exec/address-spaces.h"
-#include "hw/hw.h"
 #include "hw/xen/xen.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/boards.h"

diff --git a/target/i386/machine.c b/target/i386/machine.c
index b1146093b5724d325bd37a0a20bbc5b01420ca5f..f8c6feea083ad72aee9a23bf42f5135f6ac5524c 100644 (file)
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"

diff --git a/target/lm32/machine.c b/target/lm32/machine.c
index cc46f77324df2e5833418e4cc42b6ce56674c8b0..db43ef0631a721568efcafc6a39f7cd31f6c60f8 100644 (file)
--- a/target/lm32/machine.c
+++ b/target/lm32/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "migration/cpu.h"
 

diff --git a/target/mips/machine.c b/target/mips/machine.c
index eb2d97001daddd59f9f9c3fa0a08a8620a0fb5e7..7f4b5d524dabf971be7b03399757f1db6a7a1b55 100644 (file)
--- a/target/mips/machine.c
+++ b/target/mips/machine.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "internal.h"
-#include "hw/hw.h"
 #include "migration/cpu.h"
 
 static int cpu_post_load(void *opaque, int version_id)

diff --git a/target/moxie/machine.c b/target/moxie/machine.c
index 322a724e6f2ca010dd699abbf0defc974ecc6518..675272f9e0195fab81ad1db445f1d38b0535a973 100644 (file)
--- a/target/moxie/machine.c
+++ b/target/moxie/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "machine.h"
 #include "migration/cpu.h"

diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c
index 9fa285217d9e923deb7674df6a8053ade280e4cc..99c0470a44d3947f28fdb4d28a4a08f5916ed5b1 100644 (file)
--- a/target/openrisc/machine.c
+++ b/target/openrisc/machine.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "migration/cpu.h"
 

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 4bd95be9cd3ec5767d1ca7f1b25cc22e0372792a..4b05014a6461879bdd8a7b5bcd0595bf58c4aafc 100644 (file)
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -37,6 +37,7 @@
 #include "hw/sysbus.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_cpu_core.h"
+#include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "migration/qemu-file-types.h"
 #include "sysemu/watchdog.h"

diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index e82f5de9db7cb5cd015d9b8ea89a9724a0048843..199f5cef8f9cb40a2f70062948b83ed83daff80c 100644 (file)
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/kvm.h"
 #include "helper_regs.h"

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 3caba8d5e1f0a9d4005c82184b0f861a17f968e6..9466cd832d448163def5e6262e39352c2d7e31aa 100644 (file)
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -37,7 +37,6 @@
 #include "sysemu/hw_accel.h"
 #include "hw/qdev-properties.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/arch_init.h"
 #include "sysemu/sysemu.h"

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 6e814c230bb4db44feca98e5277929282726b894..b465bb599e5f36282ac5ac792cae4a660e920943 100644 (file)
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -36,7 +36,6 @@
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/hw_accel.h"
-#include "hw/hw.h"
 #include "sysemu/device_tree.h"
 #include "exec/gdbstub.h"
 #include "exec/ram_addr.h"

diff --git a/target/s390x/machine.c b/target/s390x/machine.c
index 12a2cd65b0e24d6cda1914b1f2235925cf9ec8ab..549bb6c2808fdbf4b5c2ffd1e1f649a1e95f4d01 100644 (file)
--- a/target/s390x/machine.c
+++ b/target/s390x/machine.c
@@ -15,7 +15,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "cpu.h"
 #include "internal.h"
 #include "kvm_s390x.h"

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 6e9c4d6151bbe829a15826aa26124e66588255d7..7a563110f0163258455d9a9269c7988a5ef970c0 100644 (file)
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -25,6 +25,7 @@
 #include "sysemu/tcg.h"
 #include "exec/exec-all.h"
 #include "trace.h"
+#include "hw/hw.h"
 #include "hw/s390x/storage-keys.h"
 
 /* #define DEBUG_S390 */

diff --git a/target/sparc/machine.c b/target/sparc/machine.c
index 32d453c0083804bf53d485e89928790cd43d792d..7309c27319a1fc1d5bddeb5e5fdd328e88f9dddb 100644 (file)
--- a/target/sparc/machine.c
+++ b/target/sparc/machine.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "qemu/timer.h"
 

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 2ffc3335f0f849ad4f45ce35a5832a8f3b18d478..16478ecd457e3427b551b1077991f5ad41404942 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -34,7 +34,6 @@
 #include "qemu/notify.h"
 #include "qemu/option.h"
 #include "migration/misc.h"
-#include "hw/hw.h"
 #include "hw/pci/pci_bus.h"
 #include "ui/spice-display.h"
 

diff --git a/vl.c b/vl.c
index 1abfd306e35d1aa6a482d1649286907fc380bc9c..20328e682c193f8fc67e7cf92bec63317a905e8e 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -55,7 +55,6 @@ int main(int argc, char **argv)
 
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
-#include "hw/hw.h"
 #include "sysemu/accel.h"
 #include "hw/usb.h"
 #include "hw/isa/isa.h"