diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-10-21 09:15:20 +0200 |
|---|---|---|
| committer | Michael Roth <michael.roth@amd.com> | 2020-11-02 08:14:36 -0600 |
| commit | 0083124b3adb67bb740f1f06c2360335a5ce1533 (patch) | |
| tree | 9684afe4afe62b5ae134542b86c359ff7c13b59d | |
| parent | 939caddc2c24a9f4840e5d9d52eb0465deed1c47 (diff) | |
| download | focaccia-qemu-0083124b3adb67bb740f1f06c2360335a5ce1533.tar.gz focaccia-qemu-0083124b3adb67bb740f1f06c2360335a5ce1533.zip | |
qga: Flatten simple union GuestDeviceId
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 should be avoided in new code. GuestDeviceId was recently added for guest-get-devices. Convert it to a flat union. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Michael Roth <michael.roth@amd.com>
| -rw-r--r-- | qga/commands-win32.c | 9 | ||||
| -rw-r--r-- | qga/qapi-schema.json | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 1efe3ba076..0c33d48aaa 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2400,16 +2400,15 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp) } skip = false; - id = g_new0(GuestDeviceIdPCI, 1); vendor_id = g_match_info_fetch(match_info, 1); device_id = g_match_info_fetch(match_info, 2); - id->vendor_id = g_ascii_strtoull(vendor_id, NULL, 16); - id->device_id = g_ascii_strtoull(device_id, NULL, 16); device->id = g_new0(GuestDeviceId, 1); device->has_id = true; - device->id->type = GUEST_DEVICE_ID_KIND_PCI; - device->id->u.pci.data = id; + device->id->type = GUEST_DEVICE_TYPE_PCI; + id = &device->id->u.pci; + id->vendor_id = g_ascii_strtoull(vendor_id, NULL, 16); + id->device_id = g_ascii_strtoull(device_id, NULL, 16); g_match_info_free(match_info); break; diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index c7bfb8bf6a..fe10631e4c 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -1257,6 +1257,12 @@ 'returns': 'GuestOSInfo' } ## +# @GuestDeviceType: +## +{ 'enum': 'GuestDeviceType', + 'data': [ 'pci' ] } + +## # @GuestDeviceIdPCI: # # @vendor-id: vendor ID @@ -1276,6 +1282,8 @@ # Since: 5.2 ## { 'union': 'GuestDeviceId', + 'base': { 'type': 'GuestDeviceType' }, + 'discriminator': 'type', 'data': { 'pci': 'GuestDeviceIdPCI' } } ## |