From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsBpa-0005l4-UX for qemu-devel@nongnu.org; Fri, 30 Oct 2015 11:43:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZsBpZ-00058c-F9 for qemu-devel@nongnu.org; Fri, 30 Oct 2015 11:43:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsBpZ-000589-49 for qemu-devel@nongnu.org; Fri, 30 Oct 2015 11:43:05 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id C9AB1C0B83EE for ; Fri, 30 Oct 2015 15:43:04 +0000 (UTC) From: Markus Armbruster Date: Fri, 30 Oct 2015 16:42:49 +0100 Message-Id: <1446219774-1802-21-git-send-email-armbru@redhat.com> In-Reply-To: <1446219774-1802-1-git-send-email-armbru@redhat.com> References: <1446219774-1802-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 20/25] memory: Convert to new qapi union layout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Eric Blake We have two issues with our qapi union layout: 1) Even though the QMP wire format spells the tag 'type', the C code spells it 'kind', requiring some hacks in the generator. 2) The C struct uses an anonymous union, which places all tag values in the same namespace as all non-variant members. This leads to spurious collisions if a tag value matches a non-variant member's name. Make the conversion to the new layout for memory-related code. Signed-off-by: Eric Blake Message-Id: <1445898903-12082-21-git-send-email-eblake@redhat.com> [Commit message tweaked slightly] Signed-off-by: Markus Armbruster --- hmp.c | 6 +++--- hw/mem/pc-dimm.c | 6 +++--- numa.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hmp.c b/hmp.c index cc4946d..39d5815 100644 --- a/hmp.c +++ b/hmp.c @@ -1958,12 +1958,12 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) value = info->value; if (value) { - switch (value->kind) { + switch (value->type) { case MEMORY_DEVICE_INFO_KIND_DIMM: - di = value->dimm; + di = value->u.dimm; monitor_printf(mon, "Memory device [%s]: \"%s\"\n", - MemoryDeviceInfoKind_lookup[value->kind], + MemoryDeviceInfoKind_lookup[value->type], di->id ? di->id : ""); monitor_printf(mon, " addr: 0x%" PRIx64 "\n", di->addr); monitor_printf(mon, " slot: %" PRId64 "\n", di->slot); diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 80f424b..d5cdab2 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -179,7 +179,7 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque) NULL); di->memdev = object_get_canonical_path(OBJECT(dimm->hostmem)); - info->dimm = di; + info->u.dimm = di; elem->value = info; elem->next = NULL; **prev = elem; @@ -203,9 +203,9 @@ ram_addr_t get_current_ram_size(void) MemoryDeviceInfo *value = info->value; if (value) { - switch (value->kind) { + switch (value->type) { case MEMORY_DEVICE_INFO_KIND_DIMM: - size += value->dimm->size; + size += value->u.dimm->size; break; default: break; diff --git a/numa.c b/numa.c index e9b18f5..fdfe294 100644 --- a/numa.c +++ b/numa.c @@ -226,9 +226,9 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error **errp) goto error; } - switch (object->kind) { + switch (object->type) { case NUMA_OPTIONS_KIND_NODE: - numa_node_parse(object->node, opts, &err); + numa_node_parse(object->u.node, opts, &err); if (err) { goto error; } @@ -487,9 +487,9 @@ static void numa_stat_memory_devices(uint64_t node_mem[]) MemoryDeviceInfo *value = info->value; if (value) { - switch (value->kind) { + switch (value->type) { case MEMORY_DEVICE_INFO_KIND_DIMM: - node_mem[value->dimm->node] += value->dimm->size; + node_mem[value->u.dimm->node] += value->u.dimm->size; break; default: break; -- 2.4.3