[Qemu-devel] [PATCH 0/2] Move some machine core code to proper places

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places
@ 2019-07-09 15:20 Markus Armbruster
  2019-07-09 15:20 ` [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ Markus Armbruster
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Markus Armbruster @ 2019-07-09 15:20 UTC (permalink / raw)
  To: qemu-devel; +Cc: ehabkost

This is a follow-up to my "Move QOM, qdev, machine core and dump code"
series, merged in commit 374f63f6810.

Markus Armbruster (2):
  hw/core: Move cpu.c, cpu.h from qom/ to hw/core/
  qapi: Move query-target from misc.json to machine.json

 MAINTAINERS                    |  6 ++---
 accel/tcg/user-exec-stub.c     |  2 +-
 arch_init.c                    | 11 --------
 cpus-common.c                  |  2 +-
 docs/interop/firmware.json     |  2 +-
 hw/acpi/cpu_hotplug.c          |  2 +-
 hw/acpi/piix4.c                |  2 +-
 hw/arm/smmu-common.c           |  2 +-
 hw/arm/virt-acpi-build.c       |  2 +-
 hw/core/Makefile.objs          |  1 +
 {qom => hw/core}/cpu.c         |  2 +-
 hw/core/generic-loader.c       |  2 +-
 hw/core/machine-qmp-cmds.c     | 10 +++++++
 hw/core/null-machine.c         |  2 +-
 hw/cpu/a9mpcore.c              |  2 +-
 hw/cpu/cluster.c               |  2 +-
 hw/i386/acpi-build.c           |  2 +-
 hw/i386/pc.c                   |  2 +-
 hw/intc/arm_gic.c              |  2 +-
 hw/intc/arm_gicv3_common.c     |  2 +-
 hw/isa/lpc_ich9.c              |  2 +-
 hw/misc/imx6_src.c             |  2 +-
 hw/ppc/spapr.c                 |  2 +-
 hw/timer/a9gtimer.c            |  2 +-
 hw/timer/arm_mptimer.c         |  2 +-
 include/exec/cpu-all.h         |  2 +-
 include/exec/cpu-defs.h        |  2 +-
 include/exec/log.h             |  2 +-
 include/hw/boards.h            |  2 +-
 include/{qom => hw/core}/cpu.h |  0
 include/hw/ppc/openpic.h       |  2 +-
 include/sysemu/hw_accel.h      |  2 +-
 include/sysemu/kvm.h           |  2 +-
 qapi/common.json               | 25 ------------------
 qapi/machine.json              | 48 +++++++++++++++++++++++++++++++++-
 qapi/misc.json                 | 23 ----------------
 qom/Makefile.objs              |  1 -
 target/alpha/cpu-qom.h         |  2 +-
 target/arm/cpu-qom.h           |  2 +-
 target/cris/cpu-qom.h          |  2 +-
 target/hppa/cpu-qom.h          |  2 +-
 target/hppa/int_helper.c       |  2 +-
 target/hppa/mem_helper.c       |  2 +-
 target/i386/cpu-qom.h          |  2 +-
 target/lm32/cpu-qom.h          |  2 +-
 target/m68k/cpu-qom.h          |  2 +-
 target/microblaze/cpu-qom.h    |  2 +-
 target/mips/cpu-qom.h          |  2 +-
 target/moxie/cpu.h             |  2 +-
 target/nios2/cpu.h             |  2 +-
 target/openrisc/cpu.h          |  2 +-
 target/ppc/cpu-qom.h           |  2 +-
 target/riscv/cpu.h             |  2 +-
 target/s390x/cpu-qom.h         |  2 +-
 target/s390x/cpu_models.h      |  2 +-
 target/sh4/cpu-qom.h           |  2 +-
 target/sparc/cpu-qom.h         |  2 +-
 target/tilegx/cpu.h            |  2 +-
 target/tricore/cpu-qom.h       |  2 +-
 target/unicore32/cpu-qom.h     |  2 +-
 target/xtensa/cpu-qom.h        |  2 +-
 trace/control-internal.h       |  2 +-
 ui/cocoa.m                     |  2 +-
 63 files changed, 114 insertions(+), 119 deletions(-)
 rename {qom => hw/core}/cpu.c (99%)
 rename include/{qom => hw/core}/cpu.h (100%)

-- 
2.21.0



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/
  2019-07-09 15:20 [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places Markus Armbruster
@ 2019-07-09 15:20 ` Markus Armbruster
  2019-07-09 15:47   ` Philippe Mathieu-Daudé
  2019-07-09 15:20 ` [Qemu-devel] [PATCH 2/2] qapi: Move query-target from misc.json to machine.json Markus Armbruster
  2019-08-12 14:10 ` [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places Markus Armbruster
  2 siblings, 1 reply; 5+ messages in thread
From: Markus Armbruster @ 2019-07-09 15:20 UTC (permalink / raw)
  To: qemu-devel; +Cc: Daniel P . Berrangé, ehabkost

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS                    | 6 ++----
 accel/tcg/user-exec-stub.c     | 2 +-
 cpus-common.c                  | 2 +-
 hw/acpi/cpu_hotplug.c          | 2 +-
 hw/acpi/piix4.c                | 2 +-
 hw/arm/smmu-common.c           | 2 +-
 hw/arm/virt-acpi-build.c       | 2 +-
 hw/core/Makefile.objs          | 1 +
 {qom => hw/core}/cpu.c         | 2 +-
 hw/core/generic-loader.c       | 2 +-
 hw/core/null-machine.c         | 2 +-
 hw/cpu/a9mpcore.c              | 2 +-
 hw/cpu/cluster.c               | 2 +-
 hw/i386/acpi-build.c           | 2 +-
 hw/i386/pc.c                   | 2 +-
 hw/intc/arm_gic.c              | 2 +-
 hw/intc/arm_gicv3_common.c     | 2 +-
 hw/isa/lpc_ich9.c              | 2 +-
 hw/misc/imx6_src.c             | 2 +-
 hw/ppc/spapr.c                 | 2 +-
 hw/timer/a9gtimer.c            | 2 +-
 hw/timer/arm_mptimer.c         | 2 +-
 include/exec/cpu-all.h         | 2 +-
 include/exec/cpu-defs.h        | 2 +-
 include/exec/log.h             | 2 +-
 include/hw/boards.h            | 2 +-
 include/{qom => hw/core}/cpu.h | 0
 include/hw/ppc/openpic.h       | 2 +-
 include/sysemu/hw_accel.h      | 2 +-
 include/sysemu/kvm.h           | 2 +-
 qom/Makefile.objs              | 1 -
 target/alpha/cpu-qom.h         | 2 +-
 target/arm/cpu-qom.h           | 2 +-
 target/cris/cpu-qom.h          | 2 +-
 target/hppa/cpu-qom.h          | 2 +-
 target/hppa/int_helper.c       | 2 +-
 target/hppa/mem_helper.c       | 2 +-
 target/i386/cpu-qom.h          | 2 +-
 target/lm32/cpu-qom.h          | 2 +-
 target/m68k/cpu-qom.h          | 2 +-
 target/microblaze/cpu-qom.h    | 2 +-
 target/mips/cpu-qom.h          | 2 +-
 target/moxie/cpu.h             | 2 +-
 target/nios2/cpu.h             | 2 +-
 target/openrisc/cpu.h          | 2 +-
 target/ppc/cpu-qom.h           | 2 +-
 target/riscv/cpu.h             | 2 +-
 target/s390x/cpu-qom.h         | 2 +-
 target/s390x/cpu_models.h      | 2 +-
 target/sh4/cpu-qom.h           | 2 +-
 target/sparc/cpu-qom.h         | 2 +-
 target/tilegx/cpu.h            | 2 +-
 target/tricore/cpu-qom.h       | 2 +-
 target/unicore32/cpu-qom.h     | 2 +-
 target/xtensa/cpu-qom.h        | 2 +-
 trace/control-internal.h       | 2 +-
 ui/cocoa.m                     | 2 +-
 57 files changed, 56 insertions(+), 58 deletions(-)
 rename {qom => hw/core}/cpu.c (99%)
 rename include/{qom => hw/core}/cpu.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index cc9636b43a..4c687d88d1 100644
--- 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
 
@@ -2046,12 +2046,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 4bf00b8496..f6d8c8fb6f 100644
--- 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 3ca58c64e8..e742658e75 100644
--- 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/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 5243918125..92b2c09f5a 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -13,7 +13,7 @@
 #include "hw/hw.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/piix4.c b/hw/acpi/piix4.c
index ec4e186cec..16d113a676 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -38,7 +38,7 @@
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/acpi/acpi_dev_interface.h"
 #include "hw/xen/xen.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 717d22bcbe..c7d7d0fee1 100644
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -21,7 +21,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 0afb372769..c3a6e98cd7 100644
--- 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 f8481d959f..1421a73df6 100644
--- 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 f376f782d8..f3ceac8500 100644
--- 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 79a493e577..eb963e2a32 100644
--- 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 "hw/loader.h"
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 04a1e2b02a..194dac56fd 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -17,7 +17,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/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 187e4d939e..71103485c5 100644
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/cpu/a9mpcore.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 6f5f037b3c..c9a02fbbaf 100644
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/cpu/cluster.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 d281ffa89e..5b25f256dd 100644
--- 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 c33ce47578..599658b83a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -73,7 +73,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 77427a4188..1a4a559925 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -22,7 +22,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 5edabb928f..49edb08f3c 100644
--- 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 "gicv3_internal.h"
 #include "hw/arm/linux-boot-if.h"
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index a7081bd52d..a54f8c6cad 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -45,7 +45,7 @@
 #include "hw/pci/pci_bus.h"
 #include "exec/address-spaces.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 878ffcdc71..c1d0c614ef 100644
--- a/hw/misc/imx6_src.c
+++ b/hw/misc/imx6_src.c
@@ -15,7 +15,7 @@
 #include "qemu/log.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 821f0d4a49..e46d52224b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -46,7 +46,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 09e2a7b7bf..d35dd61696 100644
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -27,7 +27,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 93044aacfd..75ebf047b8 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -25,7 +25,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 536ea58f81..8323094648 100644
--- 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 9bc713a70b..1b06865a24 100644
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -33,7 +33,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 de067f173b..e2cfd436e6 100644
--- 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 a71d1a53a5..07a848cb10 100644
--- 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 7642a8ea1d..6931e7ccc4 100644
--- a/include/hw/ppc/openpic.h
+++ b/include/hw/ppc/openpic.h
@@ -3,7 +3,7 @@
 
 #include "hw/sysbus.h"
 #include "hw/qdev-core.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 d2ddfb5ad0..0ec2372477 100644
--- 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 acd90aebb6..9e6b485945 100644
--- 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"
 #include "hw/irq.h"
 
diff --git a/qom/Makefile.objs b/qom/Makefile.objs
index aae478fc21..f9d77350ac 100644
--- 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 bae4945344..6f0a0adb9e 100644
--- 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 2049fa9612..7f5b244bde 100644
--- 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 7556e9f97e..308c1f95bd 100644
--- 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 9084e4701d..6367dc4793 100644
--- 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 89241c31e7..462747baf8 100644
--- 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 b12c5b5054..5a465db0dd 100644
--- 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 1a52f02a4c..0efab2fc67 100644
--- 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 b423d2564b..dc9ac9ac9f 100644
--- 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 0c157251a2..b56da8a213 100644
--- 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 1a61db77d0..49b07cc697 100644
--- 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 ee58606afe..a430c0fe4b 100644
--- 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 91ef2dc25e..01dca548e5 100644
--- 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 5d44b76389..361b06ffeb 100644
--- 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 f23b25262d..b4312c9dbb 100644
--- 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 be9b4c30c3..e7e7c4d1bf 100644
--- 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 0adb307f32..a97d01a07c 100644
--- 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.h"
 
diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
index b46217dc31..b809ec8418 100644
--- 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 174a99e561..88bd01a616 100644
--- 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 0f9fb4dd31..0c56d055ba 100644
--- 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 af6d57a9e0..7442e2768e 100644
--- 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 6fcec06a9b..9cbec247d2 100644
--- 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 93c9d77fe3..7c1e130b4e 100644
--- 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 bc68e78045..7dd04515cb 100644
--- 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 403bd95721..9ac54241bd 100644
--- 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/control-internal.h b/trace/control-internal.h
index c7fbe2d3bf..fe104b6f36 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -10,7 +10,7 @@
 #ifndef TRACE__CONTROL_INTERNAL_H
 #define TRACE__CONTROL_INTERNAL_H
 
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 
 extern int trace_events_enabled_count;
diff --git a/ui/cocoa.m b/ui/cocoa.m
index c2984028c5..41ceb94bfc 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -38,7 +38,7 @@
 #include "qemu-version.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
-- 
2.21.0



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/
  2019-07-09 15:20 ` [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ Markus Armbruster
@ 2019-07-09 15:47   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-09 15:47 UTC (permalink / raw)
  To: Markus Armbruster, qemu-devel; +Cc: Daniel P . Berrangé, ehabkost

On 7/9/19 5:20 PM, Markus Armbruster wrote:
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  MAINTAINERS                    | 6 ++----
>  accel/tcg/user-exec-stub.c     | 2 +-
>  cpus-common.c                  | 2 +-
>  hw/acpi/cpu_hotplug.c          | 2 +-
>  hw/acpi/piix4.c                | 2 +-
>  hw/arm/smmu-common.c           | 2 +-
>  hw/arm/virt-acpi-build.c       | 2 +-
>  hw/core/Makefile.objs          | 1 +
>  {qom => hw/core}/cpu.c         | 2 +-
>  hw/core/generic-loader.c       | 2 +-
>  hw/core/null-machine.c         | 2 +-
>  hw/cpu/a9mpcore.c              | 2 +-
>  hw/cpu/cluster.c               | 2 +-
>  hw/i386/acpi-build.c           | 2 +-
>  hw/i386/pc.c                   | 2 +-
>  hw/intc/arm_gic.c              | 2 +-
>  hw/intc/arm_gicv3_common.c     | 2 +-
>  hw/isa/lpc_ich9.c              | 2 +-
>  hw/misc/imx6_src.c             | 2 +-
>  hw/ppc/spapr.c                 | 2 +-
>  hw/timer/a9gtimer.c            | 2 +-
>  hw/timer/arm_mptimer.c         | 2 +-
>  include/exec/cpu-all.h         | 2 +-
>  include/exec/cpu-defs.h        | 2 +-
>  include/exec/log.h             | 2 +-
>  include/hw/boards.h            | 2 +-
>  include/{qom => hw/core}/cpu.h | 0
>  include/hw/ppc/openpic.h       | 2 +-
>  include/sysemu/hw_accel.h      | 2 +-
>  include/sysemu/kvm.h           | 2 +-
>  qom/Makefile.objs              | 1 -
>  target/alpha/cpu-qom.h         | 2 +-
>  target/arm/cpu-qom.h           | 2 +-
>  target/cris/cpu-qom.h          | 2 +-
>  target/hppa/cpu-qom.h          | 2 +-
>  target/hppa/int_helper.c       | 2 +-
>  target/hppa/mem_helper.c       | 2 +-
>  target/i386/cpu-qom.h          | 2 +-
>  target/lm32/cpu-qom.h          | 2 +-
>  target/m68k/cpu-qom.h          | 2 +-
>  target/microblaze/cpu-qom.h    | 2 +-
>  target/mips/cpu-qom.h          | 2 +-
>  target/moxie/cpu.h             | 2 +-
>  target/nios2/cpu.h             | 2 +-
>  target/openrisc/cpu.h          | 2 +-
>  target/ppc/cpu-qom.h           | 2 +-
>  target/riscv/cpu.h             | 2 +-
>  target/s390x/cpu-qom.h         | 2 +-
>  target/s390x/cpu_models.h      | 2 +-
>  target/sh4/cpu-qom.h           | 2 +-
>  target/sparc/cpu-qom.h         | 2 +-
>  target/tilegx/cpu.h            | 2 +-
>  target/tricore/cpu-qom.h       | 2 +-
>  target/unicore32/cpu-qom.h     | 2 +-
>  target/xtensa/cpu-qom.h        | 2 +-
>  trace/control-internal.h       | 2 +-
>  ui/cocoa.m                     | 2 +-
>  57 files changed, 56 insertions(+), 58 deletions(-)
>  rename {qom => hw/core}/cpu.c (99%)
>  rename include/{qom => hw/core}/cpu.h (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index cc9636b43a..4c687d88d1 100644
> --- 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
>  
> @@ -2046,12 +2046,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 4bf00b8496..f6d8c8fb6f 100644
> --- 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 3ca58c64e8..e742658e75 100644
> --- 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/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
> index 5243918125..92b2c09f5a 100644
> --- a/hw/acpi/cpu_hotplug.c
> +++ b/hw/acpi/cpu_hotplug.c
> @@ -13,7 +13,7 @@
>  #include "hw/hw.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/piix4.c b/hw/acpi/piix4.c
> index ec4e186cec..16d113a676 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -38,7 +38,7 @@
>  #include "hw/acpi/memory_hotplug.h"
>  #include "hw/acpi/acpi_dev_interface.h"
>  #include "hw/xen/xen.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 717d22bcbe..c7d7d0fee1 100644
> --- a/hw/arm/smmu-common.c
> +++ b/hw/arm/smmu-common.c
> @@ -21,7 +21,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 0afb372769..c3a6e98cd7 100644
> --- 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 f8481d959f..1421a73df6 100644
> --- 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 f376f782d8..f3ceac8500 100644
> --- 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 79a493e577..eb963e2a32 100644
> --- 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 "hw/loader.h"
> diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
> index 04a1e2b02a..194dac56fd 100644
> --- a/hw/core/null-machine.c
> +++ b/hw/core/null-machine.c
> @@ -17,7 +17,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/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
> index 187e4d939e..71103485c5 100644
> --- a/hw/cpu/a9mpcore.c
> +++ b/hw/cpu/a9mpcore.c
> @@ -12,7 +12,7 @@
>  #include "qapi/error.h"
>  #include "qemu/module.h"
>  #include "hw/cpu/a9mpcore.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 6f5f037b3c..c9a02fbbaf 100644
> --- a/hw/cpu/cluster.c
> +++ b/hw/cpu/cluster.c
> @@ -20,7 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "hw/cpu/cluster.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 d281ffa89e..5b25f256dd 100644
> --- 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 c33ce47578..599658b83a 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -73,7 +73,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 77427a4188..1a4a559925 100644
> --- a/hw/intc/arm_gic.c
> +++ b/hw/intc/arm_gic.c
> @@ -22,7 +22,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 5edabb928f..49edb08f3c 100644
> --- 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 "gicv3_internal.h"
>  #include "hw/arm/linux-boot-if.h"
> diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
> index a7081bd52d..a54f8c6cad 100644
> --- a/hw/isa/lpc_ich9.c
> +++ b/hw/isa/lpc_ich9.c
> @@ -45,7 +45,7 @@
>  #include "hw/pci/pci_bus.h"
>  #include "exec/address-spaces.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 878ffcdc71..c1d0c614ef 100644
> --- a/hw/misc/imx6_src.c
> +++ b/hw/misc/imx6_src.c
> @@ -15,7 +15,7 @@
>  #include "qemu/log.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 821f0d4a49..e46d52224b 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -46,7 +46,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 09e2a7b7bf..d35dd61696 100644
> --- a/hw/timer/a9gtimer.c
> +++ b/hw/timer/a9gtimer.c
> @@ -27,7 +27,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 93044aacfd..75ebf047b8 100644
> --- a/hw/timer/arm_mptimer.c
> +++ b/hw/timer/arm_mptimer.c
> @@ -25,7 +25,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 536ea58f81..8323094648 100644
> --- 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 9bc713a70b..1b06865a24 100644
> --- a/include/exec/cpu-defs.h
> +++ b/include/exec/cpu-defs.h
> @@ -33,7 +33,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 de067f173b..e2cfd436e6 100644
> --- 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 a71d1a53a5..07a848cb10 100644
> --- 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 7642a8ea1d..6931e7ccc4 100644
> --- a/include/hw/ppc/openpic.h
> +++ b/include/hw/ppc/openpic.h
> @@ -3,7 +3,7 @@
>  
>  #include "hw/sysbus.h"
>  #include "hw/qdev-core.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 d2ddfb5ad0..0ec2372477 100644
> --- 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 acd90aebb6..9e6b485945 100644
> --- 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"
>  #include "hw/irq.h"
>  
> diff --git a/qom/Makefile.objs b/qom/Makefile.objs
> index aae478fc21..f9d77350ac 100644
> --- 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 bae4945344..6f0a0adb9e 100644
> --- 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 2049fa9612..7f5b244bde 100644
> --- 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 7556e9f97e..308c1f95bd 100644
> --- 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 9084e4701d..6367dc4793 100644
> --- 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 89241c31e7..462747baf8 100644
> --- 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 b12c5b5054..5a465db0dd 100644
> --- 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 1a52f02a4c..0efab2fc67 100644
> --- 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 b423d2564b..dc9ac9ac9f 100644
> --- 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 0c157251a2..b56da8a213 100644
> --- 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 1a61db77d0..49b07cc697 100644
> --- 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 ee58606afe..a430c0fe4b 100644
> --- 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 91ef2dc25e..01dca548e5 100644
> --- 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 5d44b76389..361b06ffeb 100644
> --- 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 f23b25262d..b4312c9dbb 100644
> --- 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 be9b4c30c3..e7e7c4d1bf 100644
> --- 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 0adb307f32..a97d01a07c 100644
> --- 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.h"
>  
> diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
> index b46217dc31..b809ec8418 100644
> --- 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 174a99e561..88bd01a616 100644
> --- 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 0f9fb4dd31..0c56d055ba 100644
> --- 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 af6d57a9e0..7442e2768e 100644
> --- 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 6fcec06a9b..9cbec247d2 100644
> --- 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 93c9d77fe3..7c1e130b4e 100644
> --- 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 bc68e78045..7dd04515cb 100644
> --- 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 403bd95721..9ac54241bd 100644
> --- 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/control-internal.h b/trace/control-internal.h
> index c7fbe2d3bf..fe104b6f36 100644
> --- a/trace/control-internal.h
> +++ b/trace/control-internal.h
> @@ -10,7 +10,7 @@
>  #ifndef TRACE__CONTROL_INTERNAL_H
>  #define TRACE__CONTROL_INTERNAL_H
>  
> -#include "qom/cpu.h"
> +#include "hw/core/cpu.h"
>  
>  
>  extern int trace_events_enabled_count;
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index c2984028c5..41ceb94bfc 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -38,7 +38,7 @@
>  #include "qemu-version.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
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Qemu-devel] [PATCH 2/2] qapi: Move query-target from misc.json to machine.json
  2019-07-09 15:20 [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places Markus Armbruster
  2019-07-09 15:20 ` [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ Markus Armbruster
@ 2019-07-09 15:20 ` Markus Armbruster
  2019-08-12 14:10 ` [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places Markus Armbruster
  2 siblings, 0 replies; 5+ messages in thread
From: Markus Armbruster @ 2019-07-09 15:20 UTC (permalink / raw)
  To: qemu-devel; +Cc: ehabkost

Move query-target and its return type TargetInfo from misc.json to
machine.json, where they are covered by MAINTAINERS section "Machine
core".  Also move its implementation from arch_init.c to
hw/core/machine-qmp-cmds, where it is likewise covered.

All users of SysEmuTarget are now in machine.json.  Move it there from
common.json.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 arch_init.c                | 11 ---------
 docs/interop/firmware.json |  2 +-
 hw/core/machine-qmp-cmds.c | 10 ++++++++
 qapi/common.json           | 25 --------------------
 qapi/machine.json          | 48 +++++++++++++++++++++++++++++++++++++-
 qapi/misc.json             | 23 ------------------
 6 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 74b0708634..0a1531124c 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -106,14 +106,3 @@ int xen_available(void)
     return 0;
 #endif
 }
-
-
-TargetInfo *qmp_query_target(Error **errp)
-{
-    TargetInfo *info = g_malloc0(sizeof(*info));
-
-    info->arch = qapi_enum_parse(&SysEmuTarget_lookup, TARGET_NAME, -1,
-                                 &error_abort);
-
-    return info;
-}
diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json
index ff8c2ce5f2..8ffb7856d2 100644
--- a/docs/interop/firmware.json
+++ b/docs/interop/firmware.json
@@ -13,7 +13,7 @@
 # = Firmware
 ##
 
-{ 'include' : 'common.json' }
+{ 'include' : 'machine.json' }
 { 'include' : 'block-core.json' }
 
 ##
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 5bd95b8ab0..ac2dd8b56e 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -247,6 +247,16 @@ CurrentMachineParams *qmp_query_current_machine(Error **errp)
     return params;
 }
 
+TargetInfo *qmp_query_target(Error **errp)
+{
+    TargetInfo *info = g_malloc0(sizeof(*info));
+
+    info->arch = qapi_enum_parse(&SysEmuTarget_lookup, TARGET_NAME, -1,
+                                 &error_abort);
+
+    return info;
+}
+
 HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)
 {
     MachineState *ms = MACHINE(qdev_get_machine());
diff --git a/qapi/common.json b/qapi/common.json
index 99d313ef3b..3083e7005b 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -168,28 +168,3 @@
 ##
 { 'enum': 'PCIELinkWidth',
   'data': [ '1', '2', '4', '8', '12', '16', '32' ] }
-
-##
-# @SysEmuTarget:
-#
-# The comprehensive enumeration of QEMU system emulation ("softmmu")
-# targets. Run "./configure --help" in the project root directory, and
-# look for the *-softmmu targets near the "--target-list" option. The
-# individual target constants are not documented here, for the time
-# being.
-#
-# Notes: The resulting QMP strings can be appended to the "qemu-system-"
-#        prefix to produce the corresponding QEMU executable name. This
-#        is true even for "qemu-system-x86_64".
-#
-# ppcemb: dropped in 3.1
-#
-# Since: 3.0
-##
-{ 'enum' : 'SysEmuTarget',
-  'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32',
-             'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
-             'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc',
-             'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4',
-             'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32',
-             'x86_64', 'xtensa', 'xtensaeb' ] }
diff --git a/qapi/machine.json b/qapi/machine.json
index 6db8a7e2ec..de5c742d72 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -7,7 +7,30 @@
 # = Machines
 ##
 
-{ 'include': 'common.json' }
+##
+# @SysEmuTarget:
+#
+# The comprehensive enumeration of QEMU system emulation ("softmmu")
+# targets. Run "./configure --help" in the project root directory, and
+# look for the *-softmmu targets near the "--target-list" option. The
+# individual target constants are not documented here, for the time
+# being.
+#
+# Notes: The resulting QMP strings can be appended to the "qemu-system-"
+#        prefix to produce the corresponding QEMU executable name. This
+#        is true even for "qemu-system-x86_64".
+#
+# ppcemb: dropped in 3.1
+#
+# Since: 3.0
+##
+{ 'enum' : 'SysEmuTarget',
+  'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32',
+             'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
+             'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc',
+             'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4',
+             'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32',
+             'x86_64', 'xtensa', 'xtensaeb' ] }
 
 ##
 # @CpuInfoArch:
@@ -368,6 +391,29 @@
 ##
 { 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' }
 
+##
+# @TargetInfo:
+#
+# Information describing the QEMU target.
+#
+# @arch: the target architecture
+#
+# Since: 1.2.0
+##
+{ 'struct': 'TargetInfo',
+  'data': { 'arch': 'SysEmuTarget' } }
+
+##
+# @query-target:
+#
+# Return information about the target for this QEMU
+#
+# Returns: TargetInfo
+#
+# Since: 1.2.0
+##
+{ 'command': 'query-target', 'returns': 'TargetInfo' }
+
 ##
 # @NumaOptionsType:
 #
diff --git a/qapi/misc.json b/qapi/misc.json
index a7fba7230c..6bd11f50e6 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -1341,29 +1341,6 @@
 ##
 { 'command': 'query-fdsets', 'returns': ['FdsetInfo'] }
 
-##
-# @TargetInfo:
-#
-# Information describing the QEMU target.
-#
-# @arch: the target architecture
-#
-# Since: 1.2.0
-##
-{ 'struct': 'TargetInfo',
-  'data': { 'arch': 'SysEmuTarget' } }
-
-##
-# @query-target:
-#
-# Return information about the target for this QEMU
-#
-# Returns: TargetInfo
-#
-# Since: 1.2.0
-##
-{ 'command': 'query-target', 'returns': 'TargetInfo' }
-
 ##
 # @AcpiTableOptions:
 #
-- 
2.21.0



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places
  2019-07-09 15:20 [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places Markus Armbruster
  2019-07-09 15:20 ` [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ Markus Armbruster
  2019-07-09 15:20 ` [Qemu-devel] [PATCH 2/2] qapi: Move query-target from misc.json to machine.json Markus Armbruster
@ 2019-08-12 14:10 ` Markus Armbruster
  2 siblings, 0 replies; 5+ messages in thread
From: Markus Armbruster @ 2019-08-12 14:10 UTC (permalink / raw)
  To: qemu-devel; +Cc: ehabkost

Queued for 4.2.


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-08-12 14:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-09 15:20 [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places Markus Armbruster
2019-07-09 15:20 ` [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ Markus Armbruster
2019-07-09 15:47   ` Philippe Mathieu-Daudé
2019-07-09 15:20 ` [Qemu-devel] [PATCH 2/2] qapi: Move query-target from misc.json to machine.json Markus Armbruster
2019-08-12 14:10 ` [Qemu-devel] [PATCH 0/2] Move some machine core code to proper places Markus Armbruster

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.