diff options
| author | Michal Novotny <minovotn@redhat.com> | 2013-04-08 18:21:02 +0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2013-04-12 09:41:53 -0400 |
| commit | c72e768836d78c9d844428b541f7d27d54e7653d (patch) | |
| tree | 918fecbdc64875a783132695fa7e839df1c4f07e | |
| parent | 93b48c201eb6c0404d15550a0eaa3c0f7937e35e (diff) | |
| download | focaccia-qemu-c72e768836d78c9d844428b541f7d27d54e7653d.tar.gz focaccia-qemu-c72e768836d78c9d844428b541f7d27d54e7653d.zip | |
New cpu-max field in query-machines QMP command output
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>
| -rw-r--r-- | qapi-schema.json | 5 | ||||
| -rw-r--r-- | vl.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index db542f6692..66808c2f27 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 d694a9039b..6547b5fe38 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; |