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 | 11 | ||||
| -rw-r--r-- | qmp-commands.hx | 22 | ||||
| -rw-r--r-- | vl.c | 5 |
7 files changed, 56 insertions, 0 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index df44906ef9..3d98604f77 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1643,6 +1643,8 @@ 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 d319897767..c12c495dc4 100644 --- a/hmp.c +++ b/hmp.c @@ -748,6 +748,14 @@ 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 95fe76e218..80e8b412d4 100644 --- a/hmp.h +++ b/hmp.h @@ -42,6 +42,7 @@ 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 2d9e8878eb..e450919269 100644 --- a/monitor.c +++ b/monitor.c @@ -2746,6 +2746,13 @@ 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 0d16d14e4f..af499bd926 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1832,6 +1832,17 @@ { '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 diff --git a/qmp-commands.hx b/qmp-commands.hx index 3aa6bd1bd9..2051fcb49c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -385,6 +385,28 @@ 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, diff --git a/vl.c b/vl.c index aeed7f435d..7643f16351 100644 --- a/vl.c +++ b/vl.c @@ -662,6 +662,11 @@ 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 */ |