Skip to content

Commit

Permalink
numa: Flatten simple union NumaOptions
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Message-Id: <[email protected]>
  • Loading branch information
Markus Armbruster committed Feb 22, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 796b288 commit d081a49
Showing 2 changed files with 12 additions and 2 deletions.
4 changes: 2 additions & 2 deletions numa.c
Original file line number Diff line number Diff line change
@@ -228,8 +228,8 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error **errp)
}

switch (object->type) {
case NUMA_OPTIONS_KIND_NODE:
numa_node_parse(object->u.node.data, opts, &err);
case NUMA_OPTIONS_TYPE_NODE:
numa_node_parse(&object->u.node, opts, &err);
if (err) {
goto end;
}
10 changes: 10 additions & 0 deletions qapi-schema.json
Original file line number Diff line number Diff line change
@@ -5570,6 +5570,14 @@
'*head' : 'int',
'events' : [ 'InputEvent' ] } }

##
# @NumaOptionsType:
#
# Since: 2.1
##
{ 'enum': 'NumaOptionsType',
'data': [ 'node' ] }

##
# @NumaOptions:
#
@@ -5578,6 +5586,8 @@
# Since: 2.1
##
{ 'union': 'NumaOptions',
'base': { 'type': 'NumaOptionsType' },
'discriminator': 'type',
'data': {
'node': 'NumaNodeOptions' }}

0 comments on commit d081a49

Please sign in to comment.