From: Paolo Bonzini Date: Thu, 27 Nov 2025 07:41:37 +0000 (+0100) Subject: include: move hw/hw.h to hw/core/, rename X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=048a23851cd44e39c166bb31b733e9fd38c77cb8;p=thirdparty%2Fqemu.git 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 --- diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 118808f2dc..0bf519b6bb 100644 --- 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 f3d6be1e29..f5ff4b107a 100644 --- 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 6a83043553..00bc310252 100644 --- 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 bf711c49c0..f85226d1ac 100644 --- 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 40cb187a11..8252616fdd 100644 --- 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 8eec0dc600..75d7c0f849 100644 --- 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 7f841b8804..a97054132f 100644 --- 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 2eefafcaf6..50952e9934 100644 --- 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 514206b7c3..3f8acb03de 100644 --- 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 8488f125b5..22dec8b3eb 100644 --- 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 591da26d45..a6e1683885 100644 --- 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 ec935a084d..e8cac331e4 100644 --- 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 37afef0990..e927ef22a0 100644 --- 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 3d4683370c..9faf0c74c3 100644 --- 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 d39eba9f64..c076807e71 100644 --- 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 9b0db8f841..48d56e43ac 100644 --- 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 bae3a44cb0..97156dd33b 100644 --- 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 29c09b88eb..d85f8bb23f 100644 --- 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 a066ada77e..85bdcac43a 100644 --- 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 a2363a89a5..3a086915c8 100644 --- 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 869db913d4..88158144b2 100644 --- 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 76869828fc..19d1236ed7 100644 --- 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 23d13e5db5..2cbc7b4964 100644 --- 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 cff413c16f..6aacf27284 100644 --- 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 2d7d3a4645..7af0107535 100644 --- 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 4c06e3db93..fde343f06e 100644 --- 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 a0a66b105a..c734472721 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -23,7 +23,7 @@ #include #include -#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 b165ab0b93..ca75ab1be4 100644 --- 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 0f23681a3f..a9f093c357 100644 --- 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 5d11b50db9..59c73dfaeb 100644 --- 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 d2c566667d..50a7d95d9e 100644 --- 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 a0e1debfea..49deeb9468 100644 --- 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 43124bf1c7..2c96eca584 100644 --- 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 dd337558aa..d026abadd1 100644 --- 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 7a7b381059..7063f1a905 100644 --- 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"