qapi: report the default CPU type for each machine
diff mbox series

Message ID 20190521153835.23233-1-berrange@redhat.com
State New
Headers show
Series
  • qapi: report the default CPU type for each machine
Related show

Commit Message

Daniel P. Berrangé May 21, 2019, 3:38 p.m. UTC
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.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qapi/misc.json | 6 +++++-
 vl.c           | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Comments

Eric Blake May 21, 2019, 3:44 p.m. UTC | #1
On 5/21/19 10:38 AM, Daniel P. Berrangé wrote:
> 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.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  qapi/misc.json | 6 +++++-
>  vl.c           | 4 ++++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/qapi/misc.json b/qapi/misc.json
> index 8b3ca4fdd3..0bb7995bd4 100644
> --- a/qapi/misc.json
> +++ b/qapi/misc.json
> @@ -2018,12 +2018,16 @@
>  #
>  # @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7.0)
>  #
> +# @default-cpu-type: default CPU model typename if none is requested via
> +#                    the -cpu argument. (since 4.2.0)

4.1 is sufficient (unless you think this is so controversial as to miss
the current release cycle).

Otherwise,
Reviewed-by: Eric Blake <eblake@redhat.com>
Daniel P. Berrangé May 21, 2019, 3:49 p.m. UTC | #2
On Tue, May 21, 2019 at 10:44:14AM -0500, Eric Blake wrote:
> On 5/21/19 10:38 AM, Daniel P. Berrangé wrote:
> > 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.
> > 
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >  qapi/misc.json | 6 +++++-
> >  vl.c           | 4 ++++
> >  2 files changed, 9 insertions(+), 1 deletion(-)
> > 
> > diff --git a/qapi/misc.json b/qapi/misc.json
> > index 8b3ca4fdd3..0bb7995bd4 100644
> > --- a/qapi/misc.json
> > +++ b/qapi/misc.json
> > @@ -2018,12 +2018,16 @@
> >  #
> >  # @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7.0)
> >  #
> > +# @default-cpu-type: default CPU model typename if none is requested via
> > +#                    the -cpu argument. (since 4.2.0)
> 
> 4.1 is sufficient (unless you think this is so controversial as to miss
> the current release cycle).

Yes, I'm getting confused about which release we're doing right now :-)

> Otherwise,
> Reviewed-by: Eric Blake <eblake@redhat.com>

Regards,
Daniel

Patch
diff mbox series

diff --git a/qapi/misc.json b/qapi/misc.json
index 8b3ca4fdd3..0bb7995bd4 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -2018,12 +2018,16 @@ 
 #
 # @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7.0)
 #
+# @default-cpu-type: default CPU model typename if none is requested via
+#                    the -cpu argument. (since 4.2.0)
+#
 # Since: 1.2.0
 ##
 { 'struct': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
             '*is-default': 'bool', 'cpu-max': 'int',
-            'hotpluggable-cpus': 'bool'} }
+            'hotpluggable-cpus': 'bool',
+            '*default-cpu-type': 'str'} }
 
 ##
 # @query-machines:
diff --git a/vl.c b/vl.c
index 201144b162..b2de329bd2 100644
--- a/vl.c
+++ b/vl.c
@@ -1519,6 +1519,10 @@  MachineInfoList *qmp_query_machines(Error **errp)
         info->name = g_strdup(mc->name);
         info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;
         info->hotpluggable_cpus = mc->has_hotpluggable_cpus;
+        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;