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>
This commit is contained in:
commit
c530b1423b
@ -1643,8 +1643,6 @@ show qdev device model list
|
|||||||
show roms
|
show roms
|
||||||
@item info tpm
|
@item info tpm
|
||||||
show the TPM device
|
show the TPM device
|
||||||
@item info cpu_max
|
|
||||||
show the number of CPUs supported by the machine being emulated.
|
|
||||||
@end table
|
@end table
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
|
8
hmp.c
8
hmp.c
@ -750,14 +750,6 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdict)
|
|||||||
g_free(data);
|
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)
|
static void hmp_cont_cb(void *opaque, int err)
|
||||||
{
|
{
|
||||||
if (!err) {
|
if (!err) {
|
||||||
|
1
hmp.h
1
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_reset(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_system_powerdown(Monitor *mon, const QDict *qdict);
|
void hmp_system_powerdown(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_cpu(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_memsave(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_pmemsave(Monitor *mon, const QDict *qdict);
|
void hmp_pmemsave(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_ringbuf_write(Monitor *mon, const QDict *qdict);
|
void hmp_ringbuf_write(Monitor *mon, const QDict *qdict);
|
||||||
|
@ -2764,13 +2764,6 @@ static mon_cmd_t info_cmds[] = {
|
|||||||
.help = "show the TPM device",
|
.help = "show the TPM device",
|
||||||
.mhandler.cmd = hmp_info_tpm,
|
.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,
|
.name = NULL,
|
||||||
},
|
},
|
||||||
|
@ -1600,7 +1600,7 @@
|
|||||||
##
|
##
|
||||||
{ 'union': 'BlockdevAction',
|
{ 'union': 'BlockdevAction',
|
||||||
'data': {
|
'data': {
|
||||||
'blockdev-snapshot-sync': 'BlockdevSnapshot',
|
'blockdev-snapshot-sync': 'BlockdevSnapshot'
|
||||||
} }
|
} }
|
||||||
|
|
||||||
##
|
##
|
||||||
@ -1833,17 +1833,6 @@
|
|||||||
##
|
##
|
||||||
{ 'command': 'query-migrate-cache-size', 'returns': 'int' }
|
{ '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:
|
# @ObjectPropertyInfo:
|
||||||
#
|
#
|
||||||
@ -2861,11 +2850,14 @@
|
|||||||
#
|
#
|
||||||
# @default: #optional whether the machine is default
|
# @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
|
# Since: 1.2.0
|
||||||
##
|
##
|
||||||
{ 'type': 'MachineInfo',
|
{ 'type': 'MachineInfo',
|
||||||
'data': { 'name': 'str', '*alias': 'str',
|
'data': { 'name': 'str', '*alias': 'str',
|
||||||
'*is-default': 'bool' } }
|
'*is-default': 'bool', 'cpu-max': 'int' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @query-machines:
|
# @query-machines:
|
||||||
|
@ -382,28 +382,6 @@ Example:
|
|||||||
|
|
||||||
Note: CPUs' indexes are obtained with the 'query-cpus' command.
|
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
|
EQMP
|
||||||
|
|
||||||
{
|
{
|
||||||
|
6
vl.c
6
vl.c
@ -662,11 +662,6 @@ StatusInfo *qmp_query_status(Error **errp)
|
|||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t qmp_query_cpu_max(Error **errp)
|
|
||||||
{
|
|
||||||
return current_machine->max_cpus;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
/* real time host monotonic timer */
|
/* real time host monotonic timer */
|
||||||
|
|
||||||
@ -1617,6 +1612,7 @@ MachineInfoList *qmp_query_machines(Error **errp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
info->name = g_strdup(m->name);
|
info->name = g_strdup(m->name);
|
||||||
|
info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;
|
||||||
|
|
||||||
entry = g_malloc0(sizeof(*entry));
|
entry = g_malloc0(sizeof(*entry));
|
||||||
entry->value = info;
|
entry->value = info;
|
||||||
|
Loading…
Reference in New Issue
Block a user