Merge remote-tracking branch 'luiz/queue/qmp' into staging

# By Michal Novotny (2) and Eric Blake (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
  qapi: use valid JSON in schema
  Revert "New QMP command query-cpu-max and HMP command cpu_max"
  New cpu-max field in query-machines QMP command output

Message-id: 1365775103-18737-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3d98604f779fbae48fc66bf3686fb3566ec30dbe..df44906ef94ba8da74565044bb21430d301264b7 100644 (file)
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1643,8 +1643,6 @@ show qdev device model list
 show roms
 @item info tpm
 show the TPM device
-@item info cpu_max
-show the number of CPUs supported by the machine being emulated.
 @end table
 ETEXI
 

diff --git a/hmp.c b/hmp.c
index dbe9b9043e8c8dbd994682a0063bf9150a45c4da..2e35b3da4e55e2cbefcfa5a294ae091c3eb5d179 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -750,14 +750,6 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdict)
     g_free(data);
 }
 
-void hmp_query_cpu_max(Monitor *mon, const QDict *qdict)
-{
-    int cpu_max;
-
-    cpu_max = qmp_query_cpu_max(NULL);
-    monitor_printf(mon, "Maximum number of CPUs is %d\n", cpu_max);
-}
-
 static void hmp_cont_cb(void *opaque, int err)
 {
     if (!err) {

diff --git a/hmp.h b/hmp.h
index 80e8b412d4279d88a2fb9d9f70704a6112ab856a..95fe76e218f48ee6fb9ccb37768a85350deaa1e9 100644 (file)
--- a/hmp.h
+++ b/hmp.h
@@ -42,7 +42,6 @@ void hmp_stop(Monitor *mon, const QDict *qdict);
 void hmp_system_reset(Monitor *mon, const QDict *qdict);
 void hmp_system_powerdown(Monitor *mon, const QDict *qdict);
 void hmp_cpu(Monitor *mon, const QDict *qdict);
-void hmp_query_cpu_max(Monitor *mon, const QDict *qdict);
 void hmp_memsave(Monitor *mon, const QDict *qdict);
 void hmp_pmemsave(Monitor *mon, const QDict *qdict);
 void hmp_ringbuf_write(Monitor *mon, const QDict *qdict);

diff --git a/monitor.c b/monitor.c
index c897e8033f367e85c70121b296d63d6f52809e37..0f7d52c543d52787dfc35c95ccbc7f9f99ba4fee 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -2764,13 +2764,6 @@ static mon_cmd_t info_cmds[] = {
         .help       = "show the TPM device",
         .mhandler.cmd = hmp_info_tpm,
     },
-    {
-        .name       = "cpu_max",
-        .args_type  = "",
-        .params     = "",
-        .help       = "Get maximum number of VCPUs supported by machine",
-        .mhandler.cmd = hmp_query_cpu_max,
-    },
     {
         .name       = NULL,
     },

diff --git a/qapi-schema.json b/qapi-schema.json
index db542f6692fd2c101817447f42cd3ad3455ec96a..751d3c22476f9072d08a86c767e0f03605a78f07 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1600,7 +1600,7 @@
 ##
 { 'union': 'BlockdevAction',
   'data': {
-       'blockdev-snapshot-sync': 'BlockdevSnapshot',
+       'blockdev-snapshot-sync': 'BlockdevSnapshot'
    } }
 
 ##
@@ -1833,17 +1833,6 @@
 ##
 { 'command': 'query-migrate-cache-size', 'returns': 'int' }
 
-##
-## @query-cpu-max
-##
-## query maximum number of CPUs supported by machine
-##
-## Returns: number of CPUs
-##
-## Since: 1.5
-###
-{ 'command': 'query-cpu-max', 'returns': 'int' }
-
 ##
 # @ObjectPropertyInfo:
 #
@@ -2861,11 +2850,14 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type
+#           (since 1.5.0)
+#
 # Since: 1.2.0
 ##
 { 'type': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
-            '*is-default': 'bool' } }
+            '*is-default': 'bool', 'cpu-max': 'int' } }
 
 ##
 # @query-machines:

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 1e0e11ee32571209e2dfce41b5c18f01d6ad3880..4d65422c40cdf3e101d21a8d911f89f7da8a21e6 100644 (file)
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -382,28 +382,6 @@ Example:
 
 Note: CPUs' indexes are obtained with the 'query-cpus' command.
 
-EQMP
-
-    {
-        .name       = "query-cpu-max",
-        .args_type  = "",
-        .mhandler.cmd_new = qmp_marshal_input_query_cpu_max,
-    },
-
-SQMP
-query-cpu-max
--------------
-
-Get the maximum CPUs supported by the machine being currently
-emulated.
-
-Returns json-int.
-
-Example:
-
--> { "execute": "query-cpu-max" }
-<- { "return": 255 }
-
 EQMP
 
     {

diff --git a/vl.c b/vl.c
index d694a9039b61b0b6b318f80ceb73264b3e49977d..dd945496df4df6905247435d07ac62e9f3882f1f 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -662,11 +662,6 @@ StatusInfo *qmp_query_status(Error **errp)
     return info;
 }
 
-int64_t qmp_query_cpu_max(Error **errp)
-{
-    return current_machine->max_cpus;
-}
-
 /***********************************************************/
 /* real time host monotonic timer */
 
@@ -1617,6 +1612,7 @@ MachineInfoList *qmp_query_machines(Error **errp)
         }
 
         info->name = g_strdup(m->name);
+        info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;
 
         entry = g_malloc0(sizeof(*entry));
         entry->value = info;