diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-04-24 18:04:34 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-05-16 09:14:18 +0200 |
| commit | 89c81b3d4c1ccafa22f58a6169c9410003654b8e (patch) | |
| tree | 3fbbef7a25b01398b56d384baac0a5b84d9bb63e /hw | |
| parent | 1077f50b23065a1d07cbbc6bad1141d50a5d25b9 (diff) | |
| download | qemu-89c81b3d4c1ccafa22f58a6169c9410003654b8e.zip qemu-89c81b3d4c1ccafa22f58a6169c9410003654b8e.tar.gz qemu-89c81b3d4c1ccafa22f58a6169c9410003654b8e.tar.bz2 | |
hw/core: Move machine-qmp-cmds.c into the target independent source set
The only target specific code that is left in here are two spots that
use TARGET_NAME. Change them to use the new target_name() wrapper
function instead, so we can move the file into the common softmmu_ss
source set. That way we only have to compile this file once, and not
for each target anymore.
Message-Id: <20230424160434.331175-4-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/machine-qmp-cmds.c | 4 | ||||
| -rw-r--r-- | hw/core/meson.build | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index c158c02..3860a50 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -37,7 +37,7 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) MachineState *ms = MACHINE(qdev_get_machine()); MachineClass *mc = MACHINE_GET_CLASS(ms); CpuInfoFastList *head = NULL, **tail = &head; - SysEmuTarget target = qapi_enum_parse(&SysEmuTarget_lookup, TARGET_NAME, + SysEmuTarget target = qapi_enum_parse(&SysEmuTarget_lookup, target_name(), -1, &error_abort); CPUState *cpu; @@ -117,7 +117,7 @@ TargetInfo *qmp_query_target(Error **errp) { TargetInfo *info = g_malloc0(sizeof(*info)); - info->arch = qapi_enum_parse(&SysEmuTarget_lookup, TARGET_NAME, -1, + info->arch = qapi_enum_parse(&SysEmuTarget_lookup, target_name(), -1, &error_abort); return info; diff --git a/hw/core/meson.build b/hw/core/meson.build index ae977c9..959bc92 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -41,6 +41,7 @@ softmmu_ss.add(files( 'gpio.c', 'loader.c', 'machine-hmp-cmds.c', + 'machine-qmp-cmds.c', 'machine.c', 'nmi.c', 'null-machine.c', @@ -51,7 +52,3 @@ softmmu_ss.add(files( 'vm-change-state-handler.c', 'clock-vmstate.c', )) - -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( - 'machine-qmp-cmds.c', -)) |