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

numa: Flatten simple union NumaOptions

Browse Source 
Simple unions are simpler than flat unions in the schema, but more
complicated in C and on the QMP wire: there's extra indirection in C
and extra nesting on the wire, both pointless.  They're best avoided
in new code.

NumaOptions isn't new, but it's only used internally, not in QMP.
Convert it to a flat union.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1487709988-14322-2-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-21 21:46:26 +01:00
parent 796b288f7b
commit d081a49af8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
numa.c
View File

@ -228,8 +228,8 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error **errp)
} }
switch (object->type) { switch (object->type) {
case NUMA_OPTIONS_KIND_NODE: case NUMA_OPTIONS_TYPE_NODE:
numa_node_parse(object->u.node.data, opts, &err); numa_node_parse(&object->u.node, opts, &err);
if (err) { if (err) {
goto end; goto end;
} }

10
qapi-schema.json
View File

@ -5570,6 +5570,14 @@
'*head' : 'int', '*head' : 'int',
'events' : [ 'InputEvent' ] } } 'events' : [ 'InputEvent' ] } }
##
# @NumaOptionsType:
#
# Since: 2.1
##
{ 'enum': 'NumaOptionsType',
'data': [ 'node' ] }
## ##
# @NumaOptions: # @NumaOptions:
# #
@ -5578,6 +5586,8 @@
# Since: 2.1 # Since: 2.1
## ##
{ 'union': 'NumaOptions', { 'union': 'NumaOptions',
'base': { 'type': 'NumaOptionsType' },
'discriminator': 'type',
'data': { 'data': {
'node': 'NumaNodeOptions' }} 'node': 'NumaNodeOptions' }}