Monitor patches for 2019-08-21

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAl1dZKsSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTJ4QP/10izA+dSofQ9404GRq3TNzwRCKugU44
 nES9CqDh6x5emx+ADQWYkugblgfH9GOvUaAUNtY+uFaEr55yC/F+VWeVXvyjt5U6
 ZpPZqIRDOHo2+PZrddr/KcKmiomS6plz03m9bzb3pYN1yIl2ZzgClAhAqWQLk0WB
 wwiY+YsJ83YR4sdiRMZkuF+UL7N8fSqYvIIj0yzM8+8ONDor9n16PoPeFg3JSsyG
 aMxXIUnSBZAVtClaNkUPtS0Wf9XEuqoG1rvMRV4Vv+eeb7fwA414DqanRJdLlGMA
 yNRtFcVyztCfjgVEXnY9JJlFe6pDkoe8ycoimQ4YA60C9c1DIMHqyjFWXRHfDwk8
 bYMSX6CTpfoEvbTfmwqYR6KSkb/KuXiFDmcYlTYFvIt3grhhdHQbru9vy+E5sm/b
 j3CPV2DTCkeGY+oZFfKIaQT9yoWZOhmMY5doMTYyinXygPTGQROUrHtzUeRXKmJZ
 arqDRmh+mlEiGETNeYQCI45eYCSDYxO+UNrhszxhmv6B1+ixhIrV2oXhi61vVBeY
 yngY4EILbuA2Z/E4BevJk91ESWJTr3UP13c6p7yf21iN4BD1KkHy5HoXCgYfQDeV
 4kar49g6WQ/VQEiwhi65Xd0OwstynkcV69F+kMagVMgaLeRsdU5ikGJQzxTeWJRl
 SPpc7oDwuAS+
 =2F3E
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-08-21' into staging

Monitor patches for 2019-08-21

# gpg: Signature made Wed 21 Aug 2019 16:35:07 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-monitor-2019-08-21:
  monitor/qmp: Update comment for commit 4eaca8de26
  qdev: Collect HMP handlers command handlers in qdev-monitor.c
  qapi: Move query-target from misc.json to machine.json
  hw/core: Move cpu.c, cpu.h from qom/ to hw/core/

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-08-22 10:31:21 +01:00
commit f3b8f18ebf
70 changed files with 137 additions and 143 deletions

View File

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

View File

@ -1,5 +1,5 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "sysemu/replay.h" #include "sysemu/replay.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

View File

@ -106,14 +106,3 @@ int xen_available(void)
return 0; return 0;
#endif #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;
}

View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
static QemuMutex qemu_cpu_list_lock; static QemuMutex qemu_cpu_list_lock;

View File

@ -13,7 +13,7 @@
# = Firmware # = Firmware
## ##
{ 'include' : 'common.json' } { 'include' : 'machine.json' }
{ 'include' : 'block-core.json' } { 'include' : 'block-core.json' }
## ##

2
exec.c
View File

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

View File

@ -12,7 +12,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu_hotplug.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"

View File

@ -31,7 +31,7 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"

View File

@ -44,7 +44,7 @@
#include "hw/xen/xen.h" #include "hw/xen/xen.h"
#include "migration/qemu-file-types.h" #include "migration/qemu-file-types.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "trace.h" #include "trace.h"
#define GPE_BASE 0xafe0 #define GPE_BASE 0xafe0

View File

@ -20,7 +20,7 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "trace.h" #include "trace.h"
#include "exec/target_page.h" #include "exec/target_page.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/jhash.h" #include "qemu/jhash.h"

View File

@ -30,7 +30,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/bitmap.h" #include "qemu/bitmap.h"
#include "trace.h" #include "trace.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "target/arm/cpu.h" #include "target/arm/cpu.h"
#include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi-defs.h"
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"

View File

@ -8,6 +8,7 @@ common-obj-y += irq.o
common-obj-y += hotplug.o common-obj-y += hotplug.o
common-obj-$(CONFIG_SOFTMMU) += nmi.o common-obj-$(CONFIG_SOFTMMU) += nmi.o
common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.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_EMPTY_SLOT) += empty_slot.o
common-obj-$(CONFIG_XILINX_AXI) += stream.o common-obj-$(CONFIG_XILINX_AXI) += stream.o

View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "sysemu/hw_accel.h" #include "sysemu/hw_accel.h"
#include "qemu/notify.h" #include "qemu/notify.h"
#include "qemu/log.h" #include "qemu/log.h"

View File

@ -31,7 +31,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"

View File

@ -249,6 +249,16 @@ CurrentMachineParams *qmp_query_current_machine(Error **errp)
return params; 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) HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)
{ {
MachineState *ms = MACHINE(qdev_get_machine()); MachineState *ms = MACHINE(qdev_get_machine());

View File

@ -16,7 +16,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
static void machine_none_init(MachineState *mch) static void machine_none_init(MachineState *mch)
{ {

View File

@ -34,7 +34,7 @@
#include "qapi/opts-visitor.h" #include "qapi/opts-visitor.h"
#include "qapi/qapi-visit-machine.h" #include "qapi/qapi-visit-machine.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/mem/pc-dimm.h" #include "hw/mem/pc-dimm.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/boards.h" #include "hw/boards.h"

View File

@ -14,7 +14,7 @@
#include "hw/cpu/a9mpcore.h" #include "hw/cpu/a9mpcore.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
static void a9mp_priv_set_irq(void *opaque, int irq, int level) static void a9mp_priv_set_irq(void *opaque, int irq, int level)
{ {

View File

@ -21,7 +21,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/cpu/cluster.h" #include "hw/cpu/cluster.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"

View File

@ -27,7 +27,7 @@
#include "qemu/bitmap.h" #include "qemu/bitmap.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "target/i386/cpu.h" #include "target/i386/cpu.h"
#include "hw/misc/pvpanic.h" #include "hw/misc/pvpanic.h"
#include "hw/timer/hpet.h" #include "hw/timer/hpet.h"

View File

@ -76,7 +76,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-visit-common.h" #include "qapi/qapi-visit-common.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/nmi.h" #include "hw/nmi.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "hw/i386/intel_iommu.h" #include "hw/i386/intel_iommu.h"

View File

@ -23,7 +23,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "gic_internal.h" #include "gic_internal.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "trace.h" #include "trace.h"

View File

@ -24,7 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_common.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"

View File

@ -49,7 +49,7 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/nvram/fw_cfg.h" #include "hw/nvram/fw_cfg.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"

View File

@ -16,7 +16,7 @@
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "arm-powerctl.h" #include "arm-powerctl.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#ifndef DEBUG_IMX6_SRC #ifndef DEBUG_IMX6_SRC
#define DEBUG_IMX6_SRC 0 #define DEBUG_IMX6_SRC 0

View File

@ -49,7 +49,7 @@
#include "mmu-hash64.h" #include "mmu-hash64.h"
#include "mmu-book3s-v3.h" #include "mmu-book3s-v3.h"
#include "cpu-models.h" #include "cpu-models.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/ppc/ppc.h" #include "hw/ppc/ppc.h"

View File

@ -31,7 +31,7 @@
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#ifndef A9_GTIMER_ERR_DEBUG #ifndef A9_GTIMER_ERR_DEBUG
#define A9_GTIMER_ERR_DEBUG 0 #define A9_GTIMER_ERR_DEBUG 0

View File

@ -29,7 +29,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#define PTIMER_POLICY \ #define PTIMER_POLICY \
(PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD | \ (PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD | \

View File

@ -22,7 +22,7 @@
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "qemu/rcu.h" #include "qemu/rcu.h"
#define EXCP_INTERRUPT 0x10000 /* async interruption */ #define EXCP_INTERRUPT 0x10000 /* async interruption */

View File

@ -32,7 +32,7 @@
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#endif #endif
#include "exec/memattrs.h" #include "exec/memattrs.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "cpu-param.h" #include "cpu-param.h"

View File

@ -2,7 +2,7 @@
#define QEMU_EXEC_LOG_H #define QEMU_EXEC_LOG_H
#include "qemu/log.h" #include "qemu/log.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "disas/disas.h" #include "disas/disas.h"
/* cpu_dump_state() logging functions: */ /* cpu_dump_state() logging functions: */

View File

@ -9,7 +9,7 @@
#include "qapi/qapi-types-machine.h" #include "qapi/qapi-types-machine.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qom/object.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 * memory_region_allocate_system_memory - Allocate a board's main memory

View File

@ -2,7 +2,7 @@
#define OPENPIC_H #define OPENPIC_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#define MAX_CPU 32 #define MAX_CPU 32
#define MAX_MSI 8 #define MAX_MSI 8

View File

@ -11,7 +11,7 @@
#ifndef QEMU_HW_ACCEL_H #ifndef QEMU_HW_ACCEL_H
#define QEMU_HW_ACCEL_H #define QEMU_HW_ACCEL_H
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "sysemu/hax.h" #include "sysemu/hax.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/whpx.h" #include "sysemu/whpx.h"

View File

@ -15,7 +15,7 @@
#define QEMU_KVM_H #define QEMU_KVM_H
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "exec/memattrs.h" #include "exec/memattrs.h"
#ifdef NEED_CPU_H #ifdef NEED_CPU_H

View File

@ -25,7 +25,6 @@
#include "qemu/timer.h" #include "qemu/timer.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "monitor/monitor-internal.h" #include "monitor/monitor-internal.h"
#include "monitor/qdev.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/clone-visitor.h" #include "qapi/clone-visitor.h"
#include "qapi/opts-visitor.h" #include "qapi/opts-visitor.h"
@ -35,7 +34,6 @@
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-net.h" #include "qapi/qapi-commands-net.h"
#include "qapi/qapi-commands-qdev.h"
#include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-rocker.h"
#include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-tpm.h" #include "qapi/qapi-commands-tpm.h"
@ -2167,23 +2165,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
} }
} }
void hmp_device_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
qmp_device_add((QDict *)qdict, NULL, &err);
hmp_handle_error(mon, &err);
}
void hmp_device_del(Monitor *mon, const QDict *qdict)
{
const char *id = qdict_get_str(qdict, "id");
Error *err = NULL;
qmp_device_del(id, &err);
hmp_handle_error(mon, &err);
}
void hmp_netdev_add(Monitor *mon, const QDict *qdict) void hmp_netdev_add(Monitor *mon, const QDict *qdict)
{ {
Error *err = NULL; Error *err = NULL;

View File

@ -97,7 +97,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rsp)
} }
/* /*
* Emit QMP response @rsp with ID @id to @mon. * Emit QMP response @rsp to @mon.
* Null @rsp can only happen for commands with QCO_NO_SUCCESS_RESP. * Null @rsp can only happen for commands with QCO_NO_SUCCESS_RESP.
* Nothing is emitted then. * Nothing is emitted then.
*/ */

View File

@ -144,28 +144,3 @@
## ##
{ 'enum': 'PCIELinkWidth', { 'enum': 'PCIELinkWidth',
'data': [ '1', '2', '4', '8', '12', '16', '32' ] } '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' ] }

View File

@ -7,7 +7,30 @@
# = Machines # = 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: # @CpuInfoArch:
@ -368,6 +391,29 @@
## ##
{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' } { '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: # @NumaOptionsType:
# #

View File

@ -1341,29 +1341,6 @@
## ##
{ 'command': 'query-fdsets', 'returns': ['FdsetInfo'] } { '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: # @AcpiTableOptions:
# #

View File

@ -19,6 +19,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "monitor/hmp.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "monitor/qdev.h" #include "monitor/qdev.h"
#include "sysemu/arch_init.h" #include "sysemu/arch_init.h"
@ -844,6 +845,23 @@ void qmp_device_del(const char *id, Error **errp)
} }
} }
void hmp_device_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
qmp_device_add((QDict *)qdict, NULL, &err);
hmp_handle_error(mon, &err);
}
void hmp_device_del(Monitor *mon, const QDict *qdict)
{
const char *id = qdict_get_str(qdict, "id");
Error *err = NULL;
qmp_device_del(id, &err);
hmp_handle_error(mon, &err);
}
BlockBackend *blk_by_qdev_id(const char *id, Error **errp) BlockBackend *blk_by_qdev_id(const char *id, Error **errp)
{ {
DeviceState *dev; DeviceState *dev;

View File

@ -1,5 +1,4 @@
qom-obj-y = object.o container.o qom-qobject.o qom-obj-y = object.o container.o qom-qobject.o
qom-obj-y += object_interfaces.o qom-obj-y += object_interfaces.o
common-obj-y = cpu.o
common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o

View File

@ -20,7 +20,7 @@
#ifndef QEMU_ALPHA_CPU_QOM_H #ifndef QEMU_ALPHA_CPU_QOM_H
#define 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" #define TYPE_ALPHA_CPU "alpha-cpu"

View File

@ -20,7 +20,7 @@
#ifndef QEMU_ARM_CPU_QOM_H #ifndef QEMU_ARM_CPU_QOM_H
#define QEMU_ARM_CPU_QOM_H #define QEMU_ARM_CPU_QOM_H
#include "qom/cpu.h" #include "hw/core/cpu.h"
struct arm_boot_info; struct arm_boot_info;

View File

@ -20,7 +20,7 @@
#ifndef QEMU_CRIS_CPU_QOM_H #ifndef QEMU_CRIS_CPU_QOM_H
#define 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" #define TYPE_CRIS_CPU "cris-cpu"

View File

@ -20,7 +20,7 @@
#ifndef QEMU_HPPA_CPU_QOM_H #ifndef QEMU_HPPA_CPU_QOM_H
#define 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" #define TYPE_HPPA_CPU "hppa-cpu"

View File

@ -22,7 +22,7 @@
#include "qemu/log.h" #include "qemu/log.h"
#include "cpu.h" #include "cpu.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
static void eval_interrupt(HPPACPU *cpu) static void eval_interrupt(HPPACPU *cpu)

View File

@ -21,7 +21,7 @@
#include "cpu.h" #include "cpu.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "trace.h" #include "trace.h"
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY

View File

@ -20,7 +20,7 @@
#ifndef QEMU_I386_CPU_QOM_H #ifndef QEMU_I386_CPU_QOM_H
#define QEMU_I386_CPU_QOM_H #define QEMU_I386_CPU_QOM_H
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "qemu/notify.h" #include "qemu/notify.h"
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64

View File

@ -20,7 +20,7 @@
#ifndef QEMU_LM32_CPU_QOM_H #ifndef QEMU_LM32_CPU_QOM_H
#define 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" #define TYPE_LM32_CPU "lm32-cpu"

View File

@ -20,7 +20,7 @@
#ifndef QEMU_M68K_CPU_QOM_H #ifndef QEMU_M68K_CPU_QOM_H
#define 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" #define TYPE_M68K_CPU "m68k-cpu"

View File

@ -20,7 +20,7 @@
#ifndef QEMU_MICROBLAZE_CPU_QOM_H #ifndef QEMU_MICROBLAZE_CPU_QOM_H
#define 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" #define TYPE_MICROBLAZE_CPU "microblaze-cpu"

View File

@ -20,7 +20,7 @@
#ifndef QEMU_MIPS_CPU_QOM_H #ifndef QEMU_MIPS_CPU_QOM_H
#define QEMU_MIPS_CPU_QOM_H #define QEMU_MIPS_CPU_QOM_H
#include "qom/cpu.h" #include "hw/core/cpu.h"
#ifdef TARGET_MIPS64 #ifdef TARGET_MIPS64
#define TYPE_MIPS_CPU "mips64-cpu" #define TYPE_MIPS_CPU "mips64-cpu"

View File

@ -46,7 +46,7 @@ typedef struct CPUMoxieState {
struct {} end_reset_fields; struct {} end_reset_fields;
} CPUMoxieState; } CPUMoxieState;
#include "qom/cpu.h" #include "hw/core/cpu.h"
#define TYPE_MOXIE_CPU "moxie-cpu" #define TYPE_MOXIE_CPU "moxie-cpu"

View File

@ -22,7 +22,7 @@
#define NIOS2_CPU_H #define NIOS2_CPU_H
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
typedef struct CPUNios2State CPUNios2State; typedef struct CPUNios2State CPUNios2State;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)

View File

@ -21,7 +21,7 @@
#define OPENRISC_CPU_H #define OPENRISC_CPU_H
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
/* cpu_openrisc_map_address_* in CPUOpenRISCTLBContext need this decl. */ /* cpu_openrisc_map_address_* in CPUOpenRISCTLBContext need this decl. */
struct OpenRISCCPU; struct OpenRISCCPU;

View File

@ -20,7 +20,7 @@
#ifndef QEMU_PPC_CPU_QOM_H #ifndef QEMU_PPC_CPU_QOM_H
#define QEMU_PPC_CPU_QOM_H #define QEMU_PPC_CPU_QOM_H
#include "qom/cpu.h" #include "hw/core/cpu.h"
#ifdef TARGET_PPC64 #ifdef TARGET_PPC64
#define TYPE_POWERPC_CPU "powerpc64-cpu" #define TYPE_POWERPC_CPU "powerpc64-cpu"

View File

@ -20,7 +20,7 @@
#ifndef RISCV_CPU_H #ifndef RISCV_CPU_H
#define RISCV_CPU_H #define RISCV_CPU_H
#include "qom/cpu.h" #include "hw/core/cpu.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "fpu/softfloat-types.h" #include "fpu/softfloat-types.h"

View File

@ -20,7 +20,7 @@
#ifndef QEMU_S390_CPU_QOM_H #ifndef QEMU_S390_CPU_QOM_H
#define 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" #define TYPE_S390_CPU "s390x-cpu"

View File

@ -15,7 +15,7 @@
#include "cpu_features.h" #include "cpu_features.h"
#include "gen-features.h" #include "gen-features.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
/* static CPU definition */ /* static CPU definition */
struct S390CPUDef { struct S390CPUDef {

View File

@ -20,7 +20,7 @@
#ifndef QEMU_SUPERH_CPU_QOM_H #ifndef QEMU_SUPERH_CPU_QOM_H
#define 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" #define TYPE_SUPERH_CPU "superh-cpu"

View File

@ -20,7 +20,7 @@
#ifndef QEMU_SPARC_CPU_QOM_H #ifndef QEMU_SPARC_CPU_QOM_H
#define QEMU_SPARC_CPU_QOM_H #define QEMU_SPARC_CPU_QOM_H
#include "qom/cpu.h" #include "hw/core/cpu.h"
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
#define TYPE_SPARC_CPU "sparc64-cpu" #define TYPE_SPARC_CPU "sparc64-cpu"

View File

@ -94,7 +94,7 @@ typedef struct CPUTLGState {
struct {} end_reset_fields; struct {} end_reset_fields;
} CPUTLGState; } CPUTLGState;
#include "qom/cpu.h" #include "hw/core/cpu.h"
#define TYPE_TILEGX_CPU "tilegx-cpu" #define TYPE_TILEGX_CPU "tilegx-cpu"

View File

@ -18,7 +18,7 @@
#ifndef QEMU_TRICORE_CPU_QOM_H #ifndef QEMU_TRICORE_CPU_QOM_H
#define 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" #define TYPE_TRICORE_CPU "tricore-cpu"

View File

@ -11,7 +11,7 @@
#ifndef QEMU_UC32_CPU_QOM_H #ifndef QEMU_UC32_CPU_QOM_H
#define 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" #define TYPE_UNICORE32_CPU "unicore32-cpu"

View File

@ -29,7 +29,7 @@
#ifndef QEMU_XTENSA_CPU_QOM_H #ifndef QEMU_XTENSA_CPU_QOM_H
#define 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" #define TYPE_XTENSA_CPU "xtensa-cpu"

View File

@ -129,7 +129,7 @@ vcpu guest_cpu_enter(void)
# Targets: all # Targets: all
vcpu guest_cpu_exit(void) vcpu guest_cpu_exit(void)
# qom/cpu.c # hw/core/cpu.c
# Reset the state of a virtual (guest) CPU # Reset the state of a virtual (guest) CPU
# #

View File

@ -12,7 +12,7 @@
#include "control.h" #include "control.h"
#include "event-internal.h" #include "event-internal.h"
#include "qom/cpu.h" #include "hw/core/cpu.h"
/** /**
* trace_event_get_vcpu_state: * trace_event_get_vcpu_state:

View File

@ -40,7 +40,7 @@
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include "qom/cpu.h" #include "hw/core/cpu.h"
#ifndef MAC_OS_X_VERSION_10_5 #ifndef MAC_OS_X_VERSION_10_5
#define MAC_OS_X_VERSION_10_5 1050 #define MAC_OS_X_VERSION_10_5 1050