* [Qemu-devel] [PULL 1/3] New cpu-max field in query-machines QMP command output
2013-04-12 13:58 [Qemu-devel] [PULL 0/3] QMP queue Luiz Capitulino
@ 2013-04-12 13:58 ` Luiz Capitulino
2013-04-12 13:58 ` [Qemu-devel] [PULL 2/3] Revert "New QMP command query-cpu-max and HMP command cpu_max" Luiz Capitulino
2013-04-12 13:58 ` [Qemu-devel] [PULL 3/3] qapi: use valid JSON in schema Luiz Capitulino
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Capitulino @ 2013-04-12 13:58 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori
From: Michal Novotny <minovotn@redhat.com>
Alter the query-machines QMP command to output information about
maximum number of CPUs for each machine type with default value
set to 1 in case the number of max_cpus is not set.
Signed-off-by: Michal Novotny <minovotn@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
qapi-schema.json | 5 ++++-
vl.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index db542f6..66808c2 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2861,11 +2861,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/vl.c b/vl.c
index d694a90..6547b5f 100644
--- a/vl.c
+++ b/vl.c
@@ -1617,6 +1617,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;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PULL 2/3] Revert "New QMP command query-cpu-max and HMP command cpu_max"
2013-04-12 13:58 [Qemu-devel] [PULL 0/3] QMP queue Luiz Capitulino
2013-04-12 13:58 ` [Qemu-devel] [PULL 1/3] New cpu-max field in query-machines QMP command output Luiz Capitulino
@ 2013-04-12 13:58 ` Luiz Capitulino
2013-04-12 13:58 ` [Qemu-devel] [PULL 3/3] qapi: use valid JSON in schema Luiz Capitulino
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Capitulino @ 2013-04-12 13:58 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori
From: Michal Novotny <minovotn@redhat.com>
This reverts commit 4d700430a20b3d53b7b15bc5f6666f7e570e3f2c 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>
---
hmp-commands.hx | 2 --
hmp.c | 8 --------
hmp.h | 1 -
monitor.c | 7 -------
qapi-schema.json | 11 -----------
qmp-commands.hx | 22 ----------------------
vl.c | 5 -----
7 files changed, 56 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3d98604..df44906 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
diff --git a/hmp.c b/hmp.c
index dbe9b90..2e35b3d 100644
--- 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 80e8b41..95fe76e 100644
--- 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 c897e80..0f7d52c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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 66808c2..a184ce6 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -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
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 1e0e11e..4d65422 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,
diff --git a/vl.c b/vl.c
index 6547b5f..dd94549 100644
--- 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 */
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread