From d081a49af8c68ad6c8fe9b552e306c5bad7b4e61 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 21 Feb 2017 21:46:26 +0100 Subject: 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 Reviewed-by: Eric Blake Message-Id: <1487709988-14322-2-git-send-email-armbru@redhat.com> --- numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'numa.c') diff --git a/numa.c b/numa.c index 9f56be960f..e01cb547a2 100644 --- a/numa.c +++ b/numa.c @@ -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; } -- cgit v1.2.3-55-g7522