hw/core: Move cpu.c, cpu.h from qom/ to hw/core/

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190709152053.16670-2-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Rebased onto merge commit 95a9457fd44; missed instances of qom/cpu.h
in comments replaced]

diff --git a/MAINTAINERS b/MAINTAINERS
index 743a92666a71cd6fff62212a1a8a0456b96ee40c..ef6c01084b73b82bb3b553ea8856a1adfd16edd5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1274,6 +1274,7 @@ Machine core
 M: Eduardo Habkost <ehabkost@redhat.com>
 M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
 S: Supported
+F: hw/core/cpu.c
 F: hw/core/machine-qmp-cmds.c
 F: hw/core/machine.c
 F: hw/core/null-machine.c
@@ -1281,10 +1282,9 @@ F: hw/core/numa.c
 F: hw/cpu/cluster.c
 F: qapi/machine.json
 F: qapi/machine-target.json
-F: qom/cpu.c
 F: include/hw/boards.h
+F: include/hw/core/cpu.h
 F: include/hw/cpu/cluster.h
-F: include/qom/cpu.h
 F: include/sysemu/numa.h
 T: git https://github.com/ehabkost/qemu.git machine-next
 
@@ -2048,12 +2048,10 @@ F: hw/core/qdev*
 F: include/hw/qdev*
 F: include/monitor/qdev.h
 F: include/qom/
-X: include/qom/cpu.h
 F: qapi/qom.json
 F: qapi/qdev.json
 F: qdev-monitor.c
 F: qom/
-X: qom/cpu.c
 F: tests/check-qom-interface.c
 F: tests/check-qom-proplist.c
 F: tests/test-qdev-global-props.c

diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c
index 4bf00b84965329b5feb9175c3d8441626083e77b..f6d8c8fb6f2daabb75f0a20f05aa3eb549d46c43 100644 (file)
--- a/accel/tcg/user-exec-stub.c
+++ b/accel/tcg/user-exec-stub.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "sysemu/replay.h"
 #include "sysemu/sysemu.h"
 

diff --git a/cpus-common.c b/cpus-common.c
index 3ca58c64e8068aa048de67696af5dd064cfd2d00..e742658e7502ad86862f548deb63b719a0755db5 100644 (file)
--- a/cpus-common.c
+++ b/cpus-common.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "exec/cpu-common.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "sysemu/cpus.h"
 
 static QemuMutex qemu_cpu_list_lock;

diff --git a/exec.c b/exec.c
index 4aaa14b075fe522259a428c9a6473a655abc9702..16f5870caa4085bb0673022f7dfb116b0f345a44 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -937,7 +937,7 @@ void cpu_exec_unrealizefn(CPUState *cpu)
 Property cpu_common_props[] = {
 #ifndef CONFIG_USER_ONLY
     /* Create a memory property for softmmu CPU object,
-     * so users can wire up its memory. (This can't go in qom/cpu.c
+     * so users can wire up its memory. (This can't go in hw/core/cpu.c
      * because that file is compiled only once for both user-mode
      * and system builds.) The default if no link is set up is to use
      * the system address space.

diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index a83567e6aa86754f5bc57bff2e51f321076a7356..6e8293aac936e3bd7a4885344f7f6bf71bf928e4 100644 (file)
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -12,7 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/acpi/cpu_hotplug.h"
 #include "qapi/error.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 2ca52bf04558d0f4c23c758ec03e34fa4d3321bf..2034dd749edc2316a9bee06f5b7eebde1632c958 100644 (file)
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -31,7 +31,7 @@
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "sysemu/reset.h"
 #include "sysemu/runstate.h"
 #include "hw/acpi/acpi.h"

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 1c907d2a7d58dd4f5067b68e90290727fb1e7258..5742c3df8742ae4e42c8d51003917566f9738c1d 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -44,7 +44,7 @@
 #include "hw/xen/xen.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "trace.h"
 
 #define GPE_BASE 0xafe0

diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index 956ebe32c8cde746b75dfb29b19fe7d0e484161b..245817d23e9f85c38b1b336205dcda77d2e40107 100644 (file)
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -20,7 +20,7 @@
 #include "exec/address-spaces.h"
 #include "trace.h"
 #include "exec/target_page.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/jhash.h"

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index fa9afd2b7e917024fc4ad225213efb3b88c2a9aa..a8b2d97fe9e23e4e919441a3bfc096683c585731 100644 (file)
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "qemu/bitmap.h"
 #include "trace.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "target/arm/cpu.h"
 #include "hw/acpi/acpi-defs.h"
 #include "hw/acpi/acpi.h"

diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index b49f880a0c7b3b0153ff24ddde9e1ebf88a3ba30..fd0550d1d908a1ad9bc31abe33371d79abb3c271 100644 (file)
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -8,6 +8,7 @@ common-obj-y += irq.o
 common-obj-y += hotplug.o
 common-obj-$(CONFIG_SOFTMMU) += nmi.o
 common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o
+common-obj-y += cpu.o
 
 common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
 common-obj-$(CONFIG_XILINX_AXI) += stream.o

diff --git a/qom/cpu.c b/hw/core/cpu.c
similarity index 99%
rename from qom/cpu.c
rename to hw/core/cpu.c
index aeb34f8c674e1742dec3012ddad1d0fede3c6255..003584551148e949385740da744cd5082bf4008e 100644 (file)
--- a/qom/cpu.c
+++ b/hw/core/cpu.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "sysemu/hw_accel.h"
 #include "qemu/notify.h"
 #include "qemu/log.h"

diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 06d8d6466e3ee72233f013b790af21d212c18388..4b1fc86a06b2ad9587c6f21f744598d650b64b03 100644 (file)
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -31,7 +31,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "hw/sysbus.h"
 #include "sysemu/dma.h"
 #include "sysemu/reset.h"

diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 30b1991b529bb0b991db9bc498a29b18d8e60d8a..1aa0a9a01a003ee576d91048e728995de1b1c8ab 100644 (file)
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -16,7 +16,7 @@
 #include "hw/boards.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 static void machine_none_init(MachineState *mch)
 {

diff --git a/hw/core/numa.c b/hw/core/numa.c
index 7a63ddc4c67c85939e98345e55a597ef6b485b6f..4f7e4628a0a1ef856398871efd73e29c49aadc41 100644 (file)
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -34,7 +34,7 @@
 #include "qapi/opts-visitor.h"
 #include "qapi/qapi-visit-machine.h"
 #include "sysemu/qtest.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "hw/mem/pc-dimm.h"
 #include "migration/vmstate.h"
 #include "hw/boards.h"

diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index cd1e165fafffa9957d820460427a8a66785b6730..6872a3a00a1565a7860cb6fb640ec0344da3e3d1 100644 (file)
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -14,7 +14,7 @@
 #include "hw/cpu/a9mpcore.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 static void a9mp_priv_set_irq(void *opaque, int irq, int level)
 {

diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c
index 74d8d43c00b14c4351747d29e157d58bcc02a581..349a8832616954e95770256ab55c222faf3d093a 100644 (file)
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/cpu/cluster.h"
 #include "hw/qdev-properties.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/cutils.h"

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 5b0ec1b89ea8f3c5f1de86e6c3d9eb61272f0b86..034e413fd09c60868dfd3fd0c08496bfdd5e4a0a 100644 (file)
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -27,7 +27,7 @@
 #include "qemu/bitmap.h"
 #include "qemu/error-report.h"
 #include "hw/pci/pci.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "target/i386/cpu.h"
 #include "hw/misc/pvpanic.h"
 #include "hw/timer/hpet.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 3ab4bcb3ca1dd3ebfe2eb8887bf47f91fe3ba14a..006550fe28cfc201fe0ec633d1e42281177cde19 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -76,7 +76,7 @@
 #include "qapi/error.h"
 #include "qapi/qapi-visit-common.h"
 #include "qapi/visitor.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "hw/nmi.h"
 #include "hw/usb.h"
 #include "hw/i386/intel_iommu.h"

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 7af591daac54ae5536c4501bc2c9e9f883fa64ba..1d7da7baa209323c143091599d57b57c6cb11d9e 100644 (file)
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -23,7 +23,7 @@
 #include "hw/sysbus.h"
 #include "gic_internal.h"
 #include "qapi/error.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index 8f5f4c8e94a383315f9873f634fb87a38dcc70a6..f0c551d43f094184330e707eb96464951dd7e079 100644 (file)
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index eec9eb31c16e13117fce080e296b0633cd898ad9..17c292e306d2006493c36d85e6b6e88131ccfed1 100644 (file)
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -49,7 +49,7 @@
 #include "exec/address-spaces.h"
 #include "sysemu/runstate.h"
 #include "sysemu/sysemu.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "hw/nvram/fw_cfg.h"
 #include "qemu/cutils.h"
 

diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c
index 8ab18967b560330c76f1a9f3d84b1bf06e842536..dd99cc7acf0a47272f5e43432df03b21b36918ad 100644 (file)
--- a/hw/misc/imx6_src.c
+++ b/hw/misc/imx6_src.c
@@ -16,7 +16,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "arm-powerctl.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifndef DEBUG_IMX6_SRC
 #define DEBUG_IMX6_SRC 0

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index e09c67eb7547c12e76a819921cdd096fec1343e0..30308910d45c1f156097542888839ad957016d27 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -49,7 +49,7 @@
 #include "mmu-hash64.h"
 #include "mmu-book3s-v3.h"
 #include "cpu-models.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #include "hw/boards.h"
 #include "hw/ppc/ppc.h"

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index 75f18671749c062b91fa2cdf864461dadae4f9ff..4c634c83b186b8057091cafed1723d578299469d 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -31,7 +31,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifndef A9_GTIMER_ERR_DEBUG
 #define A9_GTIMER_ERR_DEBUG 0

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 983e61847e56b8ef871707653c197b3e3725b8d3..9f63abef10ebaef0748fd8e91454a5b6575699a1 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define PTIMER_POLICY                       \
     (PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD |  \

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 536ea58f81d8f5a0f5d3e1b23df887010398a11c..8323094648afe30ce5958ab80203633576834667 100644 (file)
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -22,7 +22,7 @@
 #include "exec/cpu-common.h"
 #include "exec/memory.h"
 #include "qemu/thread.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "qemu/rcu.h"
 
 #define EXCP_INTERRUPT         0x10000 /* async interruption */

diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 57a9a4ffd9bd46780032a33c17ce4ef9f0c922d9..189709b6deb33164f58051337ca5d48c6db0d09b 100644 (file)
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -32,7 +32,7 @@
 #include "exec/hwaddr.h"
 #endif
 #include "exec/memattrs.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #include "cpu-param.h"
 

diff --git a/include/exec/log.h b/include/exec/log.h
index de067f173b89e79961ff1b9eda04758b3100fa80..e2cfd436e6179ddc0f9ba16befc7cd0521d18801 100644 (file)
--- a/include/exec/log.h
+++ b/include/exec/log.h
@@ -2,7 +2,7 @@
 #define QEMU_EXEC_LOG_H
 
 #include "qemu/log.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "disas/disas.h"
 
 /* cpu_dump_state() logging functions: */

diff --git a/include/hw/boards.h b/include/hw/boards.h
index 739d109fe1f8d353ab0cd2f82d0e23debe7728bb..3c224f761f5fb84a93890cc7e5309141e08041c1 100644 (file)
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -9,7 +9,7 @@
 #include "qapi/qapi-types-machine.h"
 #include "qemu/module.h"
 #include "qom/object.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 /**
  * memory_region_allocate_system_memory - Allocate a board's main memory

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

diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h
index ec16897bfb90419a175ae1320f74ef5d1db07465..db0d29e6c289c9522024e83f57aa6699efe0a66a 100644 (file)
--- a/include/hw/ppc/openpic.h
+++ b/include/hw/ppc/openpic.h
@@ -2,7 +2,7 @@
 #define OPENPIC_H
 
 #include "hw/sysbus.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define MAX_CPU     32
 #define MAX_MSI     8

diff --git a/include/sysemu/hw_accel.h b/include/sysemu/hw_accel.h
index d2ddfb5ad049a9dc6ce11c6c98c0e68df46b3893..0ec237247729e6108a0c995ed8e5c15bc01e1625 100644 (file)
--- a/include/sysemu/hw_accel.h
+++ b/include/sysemu/hw_accel.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_HW_ACCEL_H
 #define QEMU_HW_ACCEL_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "sysemu/hax.h"
 #include "sysemu/kvm.h"
 #include "sysemu/whpx.h"

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index c8ea412f6254399866bc8e18e2cd64e820c41e76..909bcd77cf82de3473ba3ea0cd652a852aa4e191 100644 (file)
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -15,7 +15,7 @@
 #define QEMU_KVM_H
 
 #include "qemu/queue.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "exec/memattrs.h"
 
 #ifdef NEED_CPU_H

diff --git a/qom/Makefile.objs b/qom/Makefile.objs
index aae478fc212b6813ce2b95d18328ae983ed27de2..f9d77350ace9ce18656320451ff4f8593fe4b3ef 100644 (file)
--- a/qom/Makefile.objs
+++ b/qom/Makefile.objs
@@ -1,5 +1,4 @@
 qom-obj-y = object.o container.o qom-qobject.o
 qom-obj-y += object_interfaces.o
 
-common-obj-y = cpu.o
 common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o

diff --git a/target/alpha/cpu-qom.h b/target/alpha/cpu-qom.h
index bae4945344660474421e97e3af994fc7a41d85d5..6f0a0adb9efa9b87508fdbe1c6ab14b53cf99d9f 100644 (file)
--- a/target/alpha/cpu-qom.h
+++ b/target/alpha/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_ALPHA_CPU_QOM_H
 #define QEMU_ALPHA_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_ALPHA_CPU "alpha-cpu"
 

diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h
index 2049fa9612112beeea31dc9f0ad60e9f9cccff63..7f5b244bde35f6377cb6526377d325e51c884ce2 100644 (file)
--- a/target/arm/cpu-qom.h
+++ b/target/arm/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_ARM_CPU_QOM_H
 #define QEMU_ARM_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 struct arm_boot_info;
 

diff --git a/target/cris/cpu-qom.h b/target/cris/cpu-qom.h
index 7556e9f97eb0033b28d48e11829a914a7864dde2..308c1f95bdf676b3e51ac9992d6ce9d4564fb027 100644 (file)
--- a/target/cris/cpu-qom.h
+++ b/target/cris/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_CRIS_CPU_QOM_H
 #define QEMU_CRIS_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_CRIS_CPU "cris-cpu"
 

diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h
index 9084e4701d9f5891a03896a4b46462154d17c34a..6367dc4793916ad004ea959354be37632b0ca15c 100644 (file)
--- a/target/hppa/cpu-qom.h
+++ b/target/hppa/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_HPPA_CPU_QOM_H
 #define QEMU_HPPA_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_HPPA_CPU "hppa-cpu"
 

diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c
index 89241c31e7ba1b19ad18c7f4e4283bdc9f63848a..462747baf8621d9cfcd6620fe3a9e44be37d9866 100644 (file)
--- a/target/hppa/int_helper.c
+++ b/target/hppa/int_helper.c
@@ -22,7 +22,7 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifndef CONFIG_USER_ONLY
 static void eval_interrupt(HPPACPU *cpu)

diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c
index b12c5b505479aa0eff5e08d4e3c65d745ec04ea6..5a465db0dd8695d646823358bee725bb26a225ec 100644 (file)
--- a/target/hppa/mem_helper.c
+++ b/target/hppa/mem_helper.c
@@ -21,7 +21,7 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "trace.h"
 
 #ifdef CONFIG_USER_ONLY

diff --git a/target/i386/cpu-qom.h b/target/i386/cpu-qom.h
index 1a52f02a4cb72d3fa3a11788d33c319571deb6d0..0efab2fc670f91c6a024c80a959dc37c16d29cb8 100644 (file)
--- a/target/i386/cpu-qom.h
+++ b/target/i386/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_I386_CPU_QOM_H
 #define QEMU_I386_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "qemu/notify.h"
 
 #ifdef TARGET_X86_64

diff --git a/target/lm32/cpu-qom.h b/target/lm32/cpu-qom.h
index b423d2564b53822b81489775cdadfe3628c74993..dc9ac9ac9f7bfdbdddc10b2c6c0ba95123fe327d 100644 (file)
--- a/target/lm32/cpu-qom.h
+++ b/target/lm32/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_LM32_CPU_QOM_H
 #define QEMU_LM32_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_LM32_CPU "lm32-cpu"
 

diff --git a/target/m68k/cpu-qom.h b/target/m68k/cpu-qom.h
index 0c157251a27d19281d64c47d9d559047c0baa2c7..b56da8a21374823534ff792a5bff14882a7fe030 100644 (file)
--- a/target/m68k/cpu-qom.h
+++ b/target/m68k/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_M68K_CPU_QOM_H
 #define QEMU_M68K_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_M68K_CPU "m68k-cpu"
 

diff --git a/target/microblaze/cpu-qom.h b/target/microblaze/cpu-qom.h
index 1a61db77d00c300f7f440c8b1dfec512c7c149ff..49b07cc697b9d1987e938a5d5ac9cf46d714980d 100644 (file)
--- a/target/microblaze/cpu-qom.h
+++ b/target/microblaze/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_MICROBLAZE_CPU_QOM_H
 #define QEMU_MICROBLAZE_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_MICROBLAZE_CPU "microblaze-cpu"
 

diff --git a/target/mips/cpu-qom.h b/target/mips/cpu-qom.h
index ee58606afef86973e9816960cd47e255e67cc2a3..a430c0fe4bbf60405a2f11feb0e0a32d0f6521bc 100644 (file)
--- a/target/mips/cpu-qom.h
+++ b/target/mips/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_MIPS_CPU_QOM_H
 #define QEMU_MIPS_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifdef TARGET_MIPS64
 #define TYPE_MIPS_CPU "mips64-cpu"

diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h
index 91ef2dc25efe2090d9e6e2e89164f325863bc4d1..01dca548e5d53cd0fba88168825d2b9951258e0f 100644 (file)
--- a/target/moxie/cpu.h
+++ b/target/moxie/cpu.h
@@ -46,7 +46,7 @@ typedef struct CPUMoxieState {
     struct {} end_reset_fields;
 } CPUMoxieState;
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_MOXIE_CPU "moxie-cpu"
 

diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index 5d44b763892bb50d4ba4dc2f63a595c03124bc74..361b06ffeb61a9232956d1b5a6d723e9042912a3 100644 (file)
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -22,7 +22,7 @@
 #define NIOS2_CPU_H
 
 #include "exec/cpu-defs.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 typedef struct CPUNios2State CPUNios2State;
 #if !defined(CONFIG_USER_ONLY)

diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index 61ade1d4f082636edc5068fc834102a420636387..561f0f7fad471984844011e704881970703077bf 100644 (file)
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -21,7 +21,7 @@
 #define OPENRISC_CPU_H
 
 #include "exec/cpu-defs.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 /* cpu_openrisc_map_address_* in CPUOpenRISCTLBContext need this decl.  */
 struct OpenRISCCPU;

diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h
index a2f202f02183362cc8d8db5f671533b1b095a4ac..afc4760051a0c5c2eb88d7c7209ad4cb323c0c46 100644 (file)
--- a/target/ppc/cpu-qom.h
+++ b/target/ppc/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_PPC_CPU_QOM_H
 #define QEMU_PPC_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifdef TARGET_PPC64
 #define TYPE_POWERPC_CPU "powerpc64-cpu"

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 240b31e2ebba493d6ec73838e2058c22abe8c525..18d91d09204954a95df4155b53ad99d64628cb70 100644 (file)
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -20,7 +20,7 @@
 #ifndef RISCV_CPU_H
 #define RISCV_CPU_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 #include "exec/cpu-defs.h"
 #include "fpu/softfloat-types.h"
 

diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
index b46217dc311e14791f5f7736aba169d3acf748ce..b809ec8418e016cf8b227489f9055932702ed48f 100644 (file)
--- a/target/s390x/cpu-qom.h
+++ b/target/s390x/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_S390_CPU_QOM_H
 #define QEMU_S390_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_S390_CPU "s390x-cpu"
 

diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
index 174a99e56149b921bf17aadcd4e237bc892f51c3..88bd01a61695a060f57204d101fafcd5cdc7e5be 100644 (file)
--- a/target/s390x/cpu_models.h
+++ b/target/s390x/cpu_models.h
@@ -15,7 +15,7 @@
 
 #include "cpu_features.h"
 #include "gen-features.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 /* static CPU definition */
 struct S390CPUDef {

diff --git a/target/sh4/cpu-qom.h b/target/sh4/cpu-qom.h
index 0f9fb4dd315004b82fc10700cefe4c1785d2f165..0c56d055badafd820151f433c370b2c38848db93 100644 (file)
--- a/target/sh4/cpu-qom.h
+++ b/target/sh4/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_SUPERH_CPU_QOM_H
 #define QEMU_SUPERH_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_SUPERH_CPU "superh-cpu"
 

diff --git a/target/sparc/cpu-qom.h b/target/sparc/cpu-qom.h
index af6d57a9e0cc052a4883b88409fd8f53761b49ad..7442e2768e8876cc66d27e4d3ff79b96692f50e3 100644 (file)
--- a/target/sparc/cpu-qom.h
+++ b/target/sparc/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_SPARC_CPU_QOM_H
 #define QEMU_SPARC_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifdef TARGET_SPARC64
 #define TYPE_SPARC_CPU "sparc64-cpu"

diff --git a/target/tilegx/cpu.h b/target/tilegx/cpu.h
index 6fcec06a9b02d7cd573c9f2e7c6617a102aa7065..9cbec247d238a5b5fe4483225b6a0c4441803454 100644 (file)
--- a/target/tilegx/cpu.h
+++ b/target/tilegx/cpu.h
@@ -94,7 +94,7 @@ typedef struct CPUTLGState {
     struct {} end_reset_fields;
 } CPUTLGState;
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_TILEGX_CPU "tilegx-cpu"
 

diff --git a/target/tricore/cpu-qom.h b/target/tricore/cpu-qom.h
index 93c9d77fe3288ee8b51b3e99ec5bee87224b7020..7c1e130b4ede26da18b61d89e935f00282be7e3d 100644 (file)
--- a/target/tricore/cpu-qom.h
+++ b/target/tricore/cpu-qom.h
@@ -18,7 +18,7 @@
 #ifndef QEMU_TRICORE_CPU_QOM_H
 #define QEMU_TRICORE_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 
 #define TYPE_TRICORE_CPU "tricore-cpu"

diff --git a/target/unicore32/cpu-qom.h b/target/unicore32/cpu-qom.h
index bc68e7804582bfae33afdf8973272d7180efa933..7dd04515cb728dc68fa704f867c9ed8c2a4561a5 100644 (file)
--- a/target/unicore32/cpu-qom.h
+++ b/target/unicore32/cpu-qom.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_UC32_CPU_QOM_H
 #define QEMU_UC32_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_UNICORE32_CPU "unicore32-cpu"
 

diff --git a/target/xtensa/cpu-qom.h b/target/xtensa/cpu-qom.h
index 403bd957214c8bbb0a999bacdcfc3bcc31b17d8a..9ac54241bd695afa52f31b788b17cbe9b096288d 100644 (file)
--- a/target/xtensa/cpu-qom.h
+++ b/target/xtensa/cpu-qom.h
@@ -29,7 +29,7 @@
 #ifndef QEMU_XTENSA_CPU_QOM_H
 #define QEMU_XTENSA_CPU_QOM_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #define TYPE_XTENSA_CPU "xtensa-cpu"
 

diff --git a/trace-events b/trace-events
index aeea3c2bdbfd368d186e274abfa8680666fd5dfa..823a4ae64e2fc7ebcda807502652ffe4b1072038 100644 (file)
--- a/trace-events
+++ b/trace-events
@@ -129,7 +129,7 @@ vcpu guest_cpu_enter(void)
 # Targets: all
 vcpu guest_cpu_exit(void)
 
-# qom/cpu.c
+# hw/core/cpu.c
 
 # Reset the state of a virtual (guest) CPU
 #

diff --git a/trace/control-vcpu.h b/trace/control-vcpu.h
index a8f1035c2e209cf13a5c49e8bebeff9e43f9a834..0f98ebe7b5941239b7f5724ba053482981f0d65c 100644 (file)
--- a/trace/control-vcpu.h
+++ b/trace/control-vcpu.h
@@ -12,7 +12,7 @@
 
 #include "control.h"
 #include "event-internal.h"
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 /**
  * trace_event_get_vcpu_state:

diff --git a/ui/cocoa.m b/ui/cocoa.m
index f023d5166fd00ddaf86a7fcd274b2536f4d60ea5..f12e21df6e10358a6de3d17a1565cf3aa5a5185c 100644 (file)
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -40,7 +40,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include <Carbon/Carbon.h>
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifndef MAC_OS_X_VERSION_10_5
 #define MAC_OS_X_VERSION_10_5 1050