From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 6 Apr 2020 12:16:44 +0200 Subject: [PATCH] PVE: qapi: modify query machines provide '*is-current' in MachineInfo struct Signed-off-by: Thomas Lamprecht Signed-off-by: Dietmar Maurer --- hw/core/machine-qmp-cmds.c | 6 ++++++ qapi/machine.json | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 5362c80a18..3fcb82ce2f 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -234,6 +234,12 @@ MachineInfoList *qmp_query_machines(Error **errp) info->hotpluggable_cpus = mc->has_hotpluggable_cpus; info->numa_mem_supported = mc->numa_mem_supported; info->deprecated = !!mc->deprecation_reason; + + if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) { + info->has_is_current = true; + info->is_current = true; + } + if (mc->default_cpu_type) { info->default_cpu_type = g_strdup(mc->default_cpu_type); info->has_default_cpu_type = true; diff --git a/qapi/machine.json b/qapi/machine.json index 3e59199280..dfc1a49d3c 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -318,6 +318,8 @@ # # @is-default: whether the machine is default # +# @is-current: whether this machine is currently used +# # @cpu-max: maximum number of CPUs supported by the machine type # (since 1.5.0) # @@ -339,7 +341,7 @@ ## { 'struct': 'MachineInfo', 'data': { 'name': 'str', '*alias': 'str', - '*is-default': 'bool', 'cpu-max': 'int', + '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int', 'hotpluggable-cpus': 'bool', 'numa-mem-supported': 'bool', 'deprecated': 'bool', '*default-cpu-type': 'str', '*default-ram-id': 'str' } }