Skip to contentSkip to conversation

qapi: report the default CPU type for each machine

PATCH In review Daniel P. Berrangé 2 participants 2 messages Aug 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 qapi: report the default CPU type for each machine

When user doesn't request any explicit CPU model with libvirt or QEMU, a machine type specific CPU model is picked. Currently there is no way to determine what this QEMU built-in default is, so libvirt cannot report this back to the user in the XML config.

This extends the "query-machines" QMP command so that it reports the default CPU model typename for each machine.

---
 hw/core/machine-qmp-cmds.c | 4 ++++
 qapi/machine.json          | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
hw/core/machine-qmp-cmds.c +4 -0
index 526fbd5ced..033b76f7bd 100644
@@ -230,6 +230,10 @@ 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 (mc->default_cpu_type) {
+            info->default_cpu_type = g_strdup(mc->default_cpu_type);
+            info->has_default_cpu_type = true;
+        }
 
         entry = g_malloc0(sizeof(*entry));
         entry->value = info;
qapi/machine.json +4 -1
index 6db8a7e2ec..bd9cfb02da 100644
@@ -325,13 +325,16 @@
 #              in future versions of QEMU according to the QEMU deprecation
 #              policy (since 4.1.0)
 #
+# @default-cpu-type: default CPU model typename if none is requested via
+#                    the -cpu argument. (since 4.2)
+#
 # Since: 1.2.0
 ##
 { 'struct': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
             '*is-default': 'bool', 'cpu-max': 'int',
             'hotpluggable-cpus': 'bool',  'numa-mem-supported': 'bool',
-            'deprecated': 'bool' } }
+            'deprecated': 'bool', '*default-cpu-type': 'str' } }
 
 ##
 # @query-machines:
Signature · 1 line
2.21.0
#1 lore raw
Quoted 10 lines · Daniel P. Berrangé

When user doesn't request any explicit CPU model with libvirt or QEMU, a machine type specific CPU model is picked. Currently there is no way to determine what this QEMU built-in default is, so libvirt cannot report this back to the user in the XML config.

This extends the "query-machines" QMP command so that it reports the default CPU model typename for each machine.

Sorry for making this miss 4.1. Queueing now.

Signature · 1 line
Eduardo