mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "New QMP command query-cpu-max and HMP command cpu_max"

Browse Source 
This reverts commit 4d700430a2 as asked by
Luiz. The patch has been obsoleted by extending MachineInfo structure
by cpu-max field.

Signed-off-by: Michal Novotny <minovotn@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Michal Novotny 2013-04-09 16:23:39 +02:00 committed by Luiz Capitulino
parent c72e768836
commit 315f9e1a8f
7 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hmp-commands.hx
View File

@ -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

8
hmp.c
View File

@ -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) {

1
hmp.h
View File

@ -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);

7
monitor.c
View File

@ -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,
},

11
qapi-schema.json
View File

@ -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:
#

22
qmp-commands.hx
View File

@ -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
{

5
vl.c
View File

@ -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 */