include: move hw/hw.h to hw/core/, rename

Call it include/hw/core/hw-error.h since that is the only
thing it contains.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 118808f2dc75b05fb62cf09852e343cb48cc22cb..0bf519b6bb8e523696e7f9ef19248282a09734bc 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -23,7 +23,7 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/sd/sd.h"
 #include "qom/object.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index f3d6be1e295b0326422e3fc42a68862f4ac4583a..f5ff4b107ae123853d5bfd6dcd725d5a399cd8cd 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -24,7 +24,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "system/address-spaces.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/xen-stubs.c b/hw/arm/xen-stubs.c
index 6a830435533485369fba6990722d37d44ac3af7f..00bc310252f048812f28fed2ae143dc942fb5567 100644 (file)
--- a/hw/arm/xen-stubs.c
+++ b/hw/arm/xen-stubs.c
@@ -7,7 +7,7 @@
 #include "qemu/osdep.h"
 #include "qapi/qapi-commands-migration.h"
 #include "system/xen.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/xen/xen-hvm-common.h"
 #include "hw/xen/arch_hvm.h"
 

diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c
index bf711c49c048ef28f6daae8de774db147d54e2e5..f85226d1ac5db341e1026db840b8d1b1f6109c65 100644 (file)
--- a/hw/audio/lm4549.c
+++ b/hw/audio/lm4549.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qemu/log.h"
 #include "qemu/audio.h"
 #include "lm4549.h"

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 40cb187a113e5d9fc8eeafb633b635650ebb0fab..8252616fdd356f481b658ec4100ef1672e8c4a37 100644 (file)
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -50,7 +50,7 @@
 #include "qapi/type-helpers.h"
 #include "qemu/units.h"
 #include "trace.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "disas/disas.h"
 #include "migration/cpr.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 8eec0dc600b684999de261dbbb5d61edc1c1a0e0..75d7c0f8499527573006dfe68e806a160daf5fd6 100644 (file)
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/display/bcm2835_fb.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "ui/console.h"
 #include "framebuffer.h"

diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 7f841b88047e4711d24ddcf2cff51a1a9c648732..a97054132fb8ac9b84e9ff39463876044a92bb52 100644 (file)
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 2eefafcaf6784ce7d558c530c089160f78275015..50952e9934bb5199e446419ac7dd0cf2eeaa6d51 100644 (file)
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"

diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 514206b7c31c0e78e4cd24402574cb1129a2b1db..3f8acb03deb29a230bf6849437fd5d6df0d57709 100644 (file)
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -13,7 +13,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/dma/pl080.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 8488f125b5f84561df74849496a9d4fc86422c1f..22dec8b3eb2f904da1773e6fd1464ef94ba3fa58 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -26,7 +26,7 @@
 #include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 591da26d4533f445c48113907a3aae140a6ba6b6..a6e1683885a0f9d30bc632544f31ded1c0f889ca 100644 (file)
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -15,7 +15,7 @@
 #include "qapi/qapi-commands-migration.h"
 #include "trace.h"
 
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/i386/pc.h"
 #include "hw/core/irq.h"
 #include "hw/i386/apic-msidef.h"

diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index ec935a084db2cfe81269963039128dbc3c825b97..e8cac331e4cda2d38ced87a993f26571d02ba407 100644 (file)
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -33,7 +33,7 @@
 #include "qemu/module.h"
 #include "hw/intc/exynos4210_combiner.h"
 #include "hw/arm/exynos4210.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "qom/object.h"

diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index 37afef09903610e86586615a7961b7bf44e7571a..e927ef22a092485846fc4e336efd318bba32dc67 100644 (file)
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/arm/omap.h"
 

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 3d4683370c6428a72bdd19ef5812ec99ccaba6bf..9faf0c74c3d47b3ebc83576c305a3dc52b8d36f3 100644 (file)
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -41,7 +41,7 @@
 #include "qemu/module.h"
 #include "qemu/range.h"
 #include "system/system.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/net/mii.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"

diff --git a/hw/net/igb.c b/hw/net/igb.c
index d39eba9f64dccbd1882be83e5e205326df6a90da..c076807e71102333d9a70321d98cf8c7168576b4 100644 (file)
--- a/hw/net/igb.c
+++ b/hw/net/igb.c
@@ -45,7 +45,7 @@
 #include "qemu/module.h"
 #include "qemu/range.h"
 #include "system/system.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/net/mii.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c
index 9b0db8f8411053811d52006935a2060a71474893..48d56e43acae8fe1a1e1354912fed55acc494a30 100644 (file)
--- a/hw/net/igbvf.c
+++ b/hw/net/igbvf.c
@@ -38,7 +38,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/net/mii.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index bae3a44cb0c9ea94cb8255947cc45406c11f44e8..97156dd33b9f3b88b69b817a87ba91ecdb9e1ca4 100644 (file)
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/pci/pci.h"
 #include "hw/core/qdev-properties.h"
 #include "net/tap.h"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 29c09b88ebffab6e2e9eb44616f99f6d6a0da400..d85f8bb23fe4ebc376f5e17cf37158ffd2c9e6ab 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
index a066ada77ed180b67517dd76cef3258ae240000f..85bdcac43a111ffef7e05e608a15b251ec10329e 100644 (file)
--- a/hw/ppc/ppce500_spin.c
+++ b/hw/ppc/ppce500_spin.c
@@ -30,7 +30,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/sysbus.h"
 #include "system/hw_accel.h"
 #include "hw/ppc/ppc.h"

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index a2363a89a5f5018c9b7ef371de8e16aea5f4ad46..3a086915c817abcf47f453ad14294217f15371c8 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -21,7 +21,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/timer/a9gtimer.h"

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 869db913d40cd685bf7c1e0a34228eefc626bb18..88158144b23f47a463840cde46e014bbe5952a55 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/vfio/device.c b/hw/vfio/device.c
index 76869828fc899e72988f6664c18b8c774323cd4c..19d1236ed750d482280225b1db3e4f5c13a39a89 100644 (file)
--- a/hw/vfio/device.c
+++ b/hw/vfio/device.c
@@ -23,7 +23,7 @@
 
 #include "hw/vfio/vfio-device.h"
 #include "hw/vfio/pci.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
index 23d13e5db5f2cb10d6914c81497494a98775a78b..2cbc7b4964f98ad2136697707912069ff998a4c3 100644 (file)
--- a/hw/vfio/helpers.c
+++ b/hw/vfio/helpers.c
@@ -24,7 +24,7 @@
 
 #include "system/kvm.h"
 #include "hw/vfio/vfio-device.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qapi/error.h"
 #include "vfio-helpers.h"
 

diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
index cff413c16f546ac937d40612aa661def7cc10a85..6aacf27284f86da401fdd67e359500dd0545222b 100644 (file)
--- a/hw/vfio/igd.c
+++ b/hw/vfio/igd.c
@@ -16,7 +16,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "hw/core/boards.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/nvram/fw_cfg.h"
 #include "pci.h"
 #include "pci-quirks.h"

diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
index 2d7d3a464577ee258fac869e508e1b79aef2b53e..7af010753597ee99eee12d32f38e945322cbbbbf 100644 (file)
--- a/hw/vfio/listener.c
+++ b/hw/vfio/listener.c
@@ -30,7 +30,7 @@
 #include "hw/vfio/pci.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/range.h"

diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 4c06e3db936a827acce4f51e3e9d344d0611378e..fde343f06e3bb086098e6a216de0d7c2321655fd 100644 (file)
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -30,7 +30,7 @@
 #include "exec/ramlist.h"
 #include "pci.h"
 #include "trace.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "vfio-migration-internal.h"
 
 /*

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index a0a66b105aa18591a18b9aa04879d67314ca9f88..c73447272141a2b97fc6a96e5f427e6fd0458d9d 100644 (file)
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -23,7 +23,7 @@
 #include <linux/vfio.h>
 #include <sys/ioctl.h>
 
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/vfio/region.c b/hw/vfio/region.c
index b165ab0b9378c8536299334da55401fd02f4bf7c..ca75ab1be4d601f5371c929a7784c8ba264df9ae 100644 (file)
--- a/hw/vfio/region.c
+++ b/hw/vfio/region.c
@@ -23,7 +23,7 @@
 
 #include "hw/vfio/vfio-region.h"
 #include "hw/vfio/vfio-device.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index 0f23681a3f936d0bedcf6ae7e3d9406f39ed9235..a9f093c357057eaa07378c77c86da096fe9f6297 100644 (file)
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -16,7 +16,7 @@
 #include "system/address-spaces.h"
 
 #include "hw/vfio/vfio-container-legacy.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "trace.h"

diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
index 5d11b50db9c14a299fcc5eb8966ad2c062576c73..59c73dfaeb5972e390b80eb7379e9aee697c25c1 100644 (file)
--- a/hw/xen/xen-hvm-common.c
+++ b/hw/xen/xen-hvm-common.c
@@ -7,7 +7,7 @@
 #include "exec/target_page.h"
 #include "trace.h"
 
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/pci/pci_host.h"
 #include "hw/xen/xen-hvm-common.h"
 #include "hw/xen/xen-bus.h"

diff --git a/include/hw/hw.h b/include/hw/core/hw-error.h
similarity index 100%
rename from include/hw/hw.h
rename to include/hw/core/hw-error.h

diff --git a/scripts/analyze-inclusions b/scripts/analyze-inclusions
index d2c566667df3b517900abeb016e85c9cad5be335..50a7d95d9e7da25151713414e91ac3155ded3a61 100644 (file)
--- a/scripts/analyze-inclusions
+++ b/scripts/analyze-inclusions
@@ -46,7 +46,7 @@ grep_include() {
 }
 
 echo Found $(find . -name "*.d" | wc -l) object files
-echo $(grep_include -F 'hw/hw.h') files include hw/hw.h
+echo $(grep_include -F 'hw/core/hw-error.h') files include hw/core/hw-error.h
 echo $(grep_include 'target/[a-z0-9]*/cpu\.h') files include cpu.h
 echo $(grep_include -F 'qapi-types.h') files include qapi-types.h
 echo $(grep_include -F 'trace/generated-tracers.h') files include generated-tracers.h
@@ -85,8 +85,8 @@ analyze() {
 echo osdep.h:
 analyze ../include/qemu/osdep.h
 
-echo hw/hw.h:
-analyze -include ../include/qemu/osdep.h ../include/hw/hw.h
+echo hw/core/hw-error.h:
+analyze -include ../include/qemu/osdep.h ../include/hw/core/hw-error.h
 
 echo trace/generated-tracers.h:
 analyze -include ../include/qemu/osdep.h trace/generated-tracers.h
@@ -94,5 +94,5 @@ analyze -include ../include/qemu/osdep.h trace/generated-tracers.h
 echo target/i386/cpu.h:
 analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target/i386/cpu.h
 
-echo hw/hw.h + COMPILING_PER_TARGET:
-analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h
+echo hw/core/hw-error.h + COMPILING_PER_TARGET:
+analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/core/hw-error.h

diff --git a/system/cpus.c b/system/cpus.c
index a0e1debfea82b7f6535cfec412466ea1de5880c7..49deeb9468a678360f5dfc9231b53dd0dcc906a7 100644 (file)
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -45,7 +45,7 @@
 #include "system/cpu-timers.h"
 #include "system/whpx.h"
 #include "hw/core/boards.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "trace.h"
 
 #ifdef CONFIG_LINUX

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 43124bf1c78091c407a527af1c09cebd297820ce..2c96eca584edee18bdaa1b1e381ddc2fc8266504 100644 (file)
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -34,7 +34,7 @@
 
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_cpu_core.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/ppc/ppc.h"
 #include "migration/qemu-file-types.h"
 #include "system/watchdog.h"

diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index dd337558aa605267bbe8e8768b56a8692cc79251..d026abadd1108558a69d827d5229e6f8ab77b975 100644 (file)
--- a/target/ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
@@ -28,7 +28,7 @@
 #include "kvm_ppc.h"
 #include "mmu-hash64.h"
 #include "exec/log.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "internal.h"
 #include "mmu-book3s-v3.h"
 #include "mmu-books.h"

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 7a7b381059095e8de665f367199d9da413eb12ed..7063f1a905f501e7aac3595960cfd0eb0ec061c2 100644 (file)
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -26,7 +26,7 @@
 #include "system/memory.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/s390x/storage-keys.h"
 #include "hw/core/boards.h"