summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Krempa <pkrempa@redhat.com>2016-06-23 23:23:33 +0200
committerDavid Gibson <david@gibson.dropbear.id.au>2016-06-27 13:13:35 +1000
commit62c9467dfffa62d999b9b9d6ff74e03454faea5f (patch)
tree920d75f0df947eccb77e387f6a3025f399d20e35
parentd29f08616936c3c315e08efbac5a769ec43e9119 (diff)
downloadfocaccia-qemu-62c9467dfffa62d999b9b9d6ff74e03454faea5f.tar.gz
focaccia-qemu-62c9467dfffa62d999b9b9d6ff74e03454faea5f.zip
qapi: Report support for -device cpu hotplug in query-machines
For management apps it's very useful to know whether the selected
machine type supports cpu hotplug via the new -device approach. Using
the presence of 'query-hotpluggable-cpus' alone is not enough as a
witness.

Add a property to 'MachineInfo' called 'hotpluggable-cpus' that will
report the presence of this feature.

Example of output:
    {
        "hotpluggable-cpus": false,
        "name": "mac99",
        "cpu-max": 1
    },
    {
        "hotpluggable-cpus": true,
        "name": "pseries-2.7",
        "is-default": true,
        "cpu-max": 255,
        "alias": "pseries"
    },

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--qapi-schema.json5
-rw-r--r--vl.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index 84b6708125..a075759eb1 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2986,11 +2986,14 @@
 # @cpu-max: maximum number of CPUs supported by the machine type
 #           (since 1.5.0)
 #
+# @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7.0)
+#
 # Since: 1.2.0
 ##
 { 'struct': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
-            '*is-default': 'bool', 'cpu-max': 'int' } }
+            '*is-default': 'bool', 'cpu-max': 'int',
+            'hotpluggable-cpus': 'bool'} }
 
 ##
 # @query-machines:
diff --git a/vl.c b/vl.c
index c85833a63c..4c1f9aee1f 100644
--- a/vl.c
+++ b/vl.c
@@ -1524,6 +1524,7 @@ 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->query_hotpluggable_cpus;
 
         entry = g_malloc0(sizeof(*entry));
         entry->value = info;