diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:46:26 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-22 19:50:46 +0100 |
| commit | d081a49af8c68ad6c8fe9b552e306c5bad7b4e61 (patch) | |
| tree | 061a8d928533348315768c5d7fb4c38f8ba072fa | |
| parent | 796b288f7be875045670f963ce99991b3c8e96ac (diff) | |
numa: Flatten simple union NumaOptions
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>
| -rw-r--r-- | numa.c | 4 | ||||
| -rw-r--r-- | qapi-schema.json | 10 |
2 files changed, 12 insertions, 2 deletions
@@ -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; } diff --git a/qapi-schema.json b/qapi-schema.json index e9a6364b7d..a448ea8767 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5571,6 +5571,14 @@ 'events' : [ 'InputEvent' ] } } ## +# @NumaOptionsType: +# +# Since: 2.1 +## +{ 'enum': 'NumaOptionsType', + 'data': [ 'node' ] } + +## # @NumaOptions: # # A discriminated record of NUMA options. (for OptsVisitor) @@ -5578,6 +5586,8 @@ # Since: 2.1 ## { 'union': 'NumaOptions', + 'base': { 'type': 'NumaOptionsType' }, + 'discriminator': 'type', 'data': { 'node': 'NumaNodeOptions' }} |