diff options
| -rw-r--r-- | hmp-commands.hx | 2 | ||||
| -rw-r--r-- | hmp.c | 8 | ||||
| -rw-r--r-- | hmp.h | 1 | ||||
| -rw-r--r-- | monitor.c | 7 | ||||
| -rw-r--r-- | qapi-schema.json | 18 | ||||
| -rw-r--r-- | qmp-commands.hx | 22 | ||||
| -rw-r--r-- | vl.c | 6 |
7 files changed, 6 insertions, 58 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index 3d98604f77..df44906ef9 100644 --- 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 @@ -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) { @@ -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); @@ -2765,13 +2765,6 @@ static mon_cmd_t info_cmds[] = { .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 db542f6692..751d3c2247 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1600,7 +1600,7 @@ ## { 'union': 'BlockdevAction', 'data': { - 'blockdev-snapshot-sync': 'BlockdevSnapshot', + 'blockdev-snapshot-sync': 'BlockdevSnapshot' } } ## @@ -1834,17 +1834,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: # # @name: the name of the property @@ -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 1e0e11ee32..4d65422c40 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -385,28 +385,6 @@ 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 - - { .name = "memsave", .args_type = "val:l,size:i,filename:s,cpu:i?", .mhandler.cmd_new = qmp_marshal_input_memsave, @@ -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; |