diff options
author | Eric Blake <eblake@redhat.com> | 2015-10-26 16:34:59 -0600 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2015-11-02 08:30:28 +0100 |
commit | 1fd5d4fea4ba686705fd377c7cffc0f0c9f83f93 (patch) | |
tree | 06e8688054ab03a807f7368382bf68de87a902a3 /hmp.c | |
parent | 568c73a4783cd981e9aa6de4f15dcda7829643ad (diff) | |
download | qemu-1fd5d4fea4ba686705fd377c7cffc0f0c9f83f93.zip qemu-1fd5d4fea4ba686705fd377c7cffc0f0c9f83f93.tar.gz qemu-1fd5d4fea4ba686705fd377c7cffc0f0c9f83f93.tar.bz2 |
memory: Convert to new qapi union layout
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 <eblake@redhat.com>
Message-Id: <1445898903-12082-21-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hmp.c')
-rw-r--r-- | hmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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); |