Move some machine core code to proper places
Subsystems (2)
cover Move some machine core code to proper places
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%)Signature · 1 line
2.21.0
PATCH 1/2 hw/core: Move cpu.c, cpu.h from qom/ to hw/core/
---
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%)MAINTAINERS +2 -4
@@ -1274,6 +1274,7 @@ Machine core M: Eduardo Habkost <[email protected]> M: Marcel Apfelbaum <[email protected]> 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
accel/tcg/user-exec-stub.c +1 -1
@@ -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"
cpus-common.c +1 -1
@@ -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;
hw/acpi/cpu_hotplug.c +1 -1
@@ -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"
hw/acpi/piix4.c +1 -1
@@ -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
hw/arm/smmu-common.c +1 -1
@@ -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"
hw/arm/virt-acpi-build.c +1 -1
@@ -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"
hw/core/Makefile.objs +1 -0
@@ -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
hw/core/cpu.c renamed from qom/cpu.c +1 -1
@@ -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"
hw/core/generic-loader.c +1 -1
@@ -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"
hw/core/null-machine.c +1 -1
@@ -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) {
hw/cpu/a9mpcore.c +1 -1
@@ -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) {
hw/cpu/cluster.c +1 -1
@@ -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"
hw/i386/acpi-build.c +1 -1
@@ -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"
hw/i386/pc.c +1 -1
@@ -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"
hw/intc/arm_gic.c +1 -1
@@ -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"
hw/intc/arm_gicv3_common.c +1 -1
@@ -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"
hw/isa/lpc_ich9.c +1 -1
@@ -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"
hw/misc/imx6_src.c +1 -1
@@ -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
hw/ppc/spapr.c +1 -1
@@ -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"
hw/timer/a9gtimer.c +1 -1
@@ -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
hw/timer/arm_mptimer.c +1 -1
@@ -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 | \
include/exec/cpu-all.h +1 -1
@@ -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 */
include/exec/cpu-defs.h +1 -1
@@ -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"
include/exec/log.h +1 -1
@@ -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: */
include/hw/boards.h +1 -1
@@ -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
include/hw/core/cpu.h renamed from include/qom/cpu.h +0 -0
include/hw/ppc/openpic.h +1 -1
@@ -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
include/sysemu/hw_accel.h +1 -1
@@ -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"
include/sysemu/kvm.h +1 -1
@@ -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"
qom/Makefile.objs +0 -1
@@ -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
target/alpha/cpu-qom.h +1 -1
@@ -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"
target/arm/cpu-qom.h +1 -1
@@ -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 ;
target/cris/cpu-qom.h +1 -1
@@ -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"
target/hppa/cpu-qom.h +1 -1
@@ -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"
target/hppa/int_helper.c +1 -1
@@ -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)
target/hppa/mem_helper.c +1 -1
@@ -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
target/i386/cpu-qom.h +1 -1
@@ -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
target/lm32/cpu-qom.h +1 -1
@@ -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"
target/m68k/cpu-qom.h +1 -1
@@ -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"
target/microblaze/cpu-qom.h +1 -1
@@ -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"
target/mips/cpu-qom.h +1 -1
@@ -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"
target/moxie/cpu.h +1 -1
@@ -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"
target/nios2/cpu.h +1 -1
@@ -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 )
target/openrisc/cpu.h +1 -1
@@ -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 ;
target/ppc/cpu-qom.h +1 -1
@@ -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"
target/riscv/cpu.h +1 -1
@@ -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"
target/s390x/cpu-qom.h +1 -1
@@ -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"
target/s390x/cpu_models.h +1 -1
@@ -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 {
target/sh4/cpu-qom.h +1 -1
@@ -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"
target/sparc/cpu-qom.h +1 -1
@@ -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"
target/tilegx/cpu.h +1 -1
@@ -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"
target/tricore/cpu-qom.h +1 -1
@@ -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"
target/unicore32/cpu-qom.h +1 -1
@@ -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"
target/xtensa/cpu-qom.h +1 -1
@@ -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"
trace/control-internal.h +1 -1
@@ -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;
ui/cocoa.m +1 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH 1/2] hw/core: Move cpu.c, cpu.h from qom/ to hw/core/
Quoted 2 lines · Markus Armbruster
Suggested-by Daniel P. Berrangé <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 816 lines
--- 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%)MAINTAINERS +2
-4@@ -1274,6 +1274,7 @@ Machine core M: Eduardo Habkost <[email protected]> M: Marcel Apfelbaum <[email protected]> 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.caccel/tcg/user-exec-stub.c +1
-1@@ -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" cpus-common.c +1
-1@@ -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;hw/acpi/cpu_hotplug.c +1
-1@@ -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" hw/acpi/piix4.c +1
-1@@ -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 0xafe0hw/arm/smmu-common.c +1
-1@@ -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" hw/arm/virt-acpi-build.c +1
-1@@ -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" hw/core/Makefile.objs +1
-0@@ -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.ohw/core/cpu.c renamed from qom/cpu.c +1
-1@@ -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" hw/core/generic-loader.c +1
-1@@ -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" hw/core/null-machine.c +1
-1@@ -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) {hw/cpu/a9mpcore.c +1
-1@@ -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) {hw/cpu/cluster.c +1
-1@@ -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" hw/i386/acpi-build.c +1
-1@@ -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" hw/i386/pc.c +1
-1@@ -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" hw/intc/arm_gic.c +1
-1@@ -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" hw/intc/arm_gicv3_common.c +1
-1@@ -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" hw/isa/lpc_ich9.c +1
-1@@ -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" hw/misc/imx6_src.c +1
-1@@ -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 0hw/ppc/spapr.c +1
-1@@ -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" hw/timer/a9gtimer.c +1
-1@@ -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 0hw/timer/arm_mptimer.c +1
-1@@ -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 | \include/exec/cpu-all.h +1
-1@@ -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 */ include/exec/cpu-defs.h +1
-1@@ -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" include/exec/log.h +1
-1@@ -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: */ include/hw/boards.h +1
-1@@ -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 include/hw/core/cpu.h renamed from include/qom/cpu.h +0
-0include/hw/ppc/openpic.h +1
-1@@ -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 8include/sysemu/hw_accel.h +1
-1@@ -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" include/sysemu/kvm.h +1
-1@@ -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" qom/Makefile.objs +0
-1@@ -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.otarget/alpha/cpu-qom.h +1
-1@@ -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"target/arm/cpu-qom.h +1
-1@@ -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 ;target/cris/cpu-qom.h +1
-1@@ -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"target/hppa/cpu-qom.h +1
-1@@ -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"target/hppa/int_helper.c +1
-1@@ -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)target/hppa/mem_helper.c +1
-1@@ -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 target/i386/cpu-qom.h +1
-1@@ -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 target/lm32/cpu-qom.h +1
-1@@ -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"target/m68k/cpu-qom.h +1
-1@@ -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"target/microblaze/cpu-qom.h +1
-1@@ -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"target/mips/cpu-qom.h +1
-1@@ -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"target/moxie/cpu.h +1
-1@@ -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"target/nios2/cpu.h +1
-1@@ -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 )target/openrisc/cpu.h +1
-1@@ -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 ;target/ppc/cpu-qom.h +1
-1@@ -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"target/riscv/cpu.h +1
-1@@ -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" target/s390x/cpu-qom.h +1
-1@@ -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"target/s390x/cpu_models.h +1
-1@@ -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 {target/sh4/cpu-qom.h +1
-1@@ -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"target/sparc/cpu-qom.h +1
-1@@ -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"target/tilegx/cpu.h +1
-1@@ -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"target/tricore/cpu-qom.h +1
-1@@ -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"target/unicore32/cpu-qom.h +1
-1@@ -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"target/xtensa/cpu-qom.h +1
-1@@ -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"trace/control-internal.h +1
-1@@ -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;ui/cocoa.m +1
-1@@ -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
PATCH 2/2 qapi: Move query-target from misc.json to machine.json
In reply to Markus ArmbrusterMove 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.
--- 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(-)
arch_init.c +0 -11
@@ -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; -}
docs/interop/firmware.json +1 -1
@@ -13,7 +13,7 @@ # = Firmware ## -{ 'include' : 'common.json' } +{ 'include' : 'machine.json' } { 'include' : 'block-core.json' } ##
hw/core/machine-qmp-cmds.c +10 -0
@@ -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 ());
qapi/common.json +0 -25
@@ -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' ] }
qapi/machine.json +47 -1
60 lines not on this page · raw message
qapi/misc.json +0 -23
@@ -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: #
Signature · 1 line
2.21.0
Queued for 4.2.