SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qga: Rename guest-get-devices return member 'address' to 'id'

Browse Source 
Member 'address' is union GuestDeviceAddress with a single branch
GuestDeviceAddressPCI, containing PCI vendor ID and device ID.  This
is not a PCI address.  Type GuestPCIAddress is.  Messed up in recent
commit 2e4211cee4 "qga: add command guest-get-devices for reporting
VirtIO devices".

Rename type GuestDeviceAddressPCI to GuestDeviceIdPCI, type
GuestDeviceAddress to GuestDeviceId, and member 'address' to 'id'.

Document the member properly while there.

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>
This commit is contained in:
Markus Armbruster 2020-10-21 09:15:17 +02:00 committed by Michael Roth
parent 2c6605389c
commit b519e2e982
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qga/commands-win32.c
View File

@ -2390,22 +2390,22 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp)
} }
for (j = 0; hw_ids[j] != NULL; j++) { for (j = 0; hw_ids[j] != NULL; j++) {
GMatchInfo *match_info; GMatchInfo *match_info;
GuestDeviceAddressPCI *address; GuestDeviceIdPCI *id;
if (!g_regex_match(device_pci_re, hw_ids[j], 0, &match_info)) { if (!g_regex_match(device_pci_re, hw_ids[j], 0, &match_info)) {
continue; continue;
} }
skip = false; skip = false;
address = g_new0(GuestDeviceAddressPCI, 1); id = g_new0(GuestDeviceIdPCI, 1);
vendor_id = g_match_info_fetch(match_info, 1); vendor_id = g_match_info_fetch(match_info, 1);
device_id = g_match_info_fetch(match_info, 2); device_id = g_match_info_fetch(match_info, 2);
address->vendor_id = g_ascii_strtoull(vendor_id, NULL, 16); id->vendor_id = g_ascii_strtoull(vendor_id, NULL, 16);
address->device_id = g_ascii_strtoull(device_id, NULL, 16); id->device_id = g_ascii_strtoull(device_id, NULL, 16);
device->address = g_new0(GuestDeviceAddress, 1); device->id = g_new0(GuestDeviceId, 1);
device->has_address = true; device->has_id = true;
device->address->type = GUEST_DEVICE_ADDRESS_KIND_PCI; device->id->type = GUEST_DEVICE_ID_KIND_PCI;
device->address->u.pci.data = address; device->id->u.pci.data = id;
g_match_info_free(match_info); g_match_info_free(match_info);
break; break;

17
qga/qapi-schema.json
View File

@ -1257,26 +1257,26 @@
'returns': 'GuestOSInfo' } 'returns': 'GuestOSInfo' }
## ##
# @GuestDeviceAddressPCI: # @GuestDeviceIdPCI:
# #
# @vendor-id: vendor ID # @vendor-id: vendor ID
# @device-id: device ID # @device-id: device ID
# #
# Since: 5.2 # Since: 5.2
## ##
{ 'struct': 'GuestDeviceAddressPCI', { 'struct': 'GuestDeviceIdPCI',
'data': { 'vendor-id': 'uint16', 'device-id': 'uint16' } } 'data': { 'vendor-id': 'uint16', 'device-id': 'uint16' } }
## ##
# @GuestDeviceAddress: # @GuestDeviceId:
# #
# Address of the device # Id of the device
# - @pci: address of PCI device, since: 5.2 # - @pci: PCI ID, since: 5.2
# #
# Since: 5.2 # Since: 5.2
## ##
{ 'union': 'GuestDeviceAddress', { 'union': 'GuestDeviceId',
'data': { 'pci': 'GuestDeviceAddressPCI' } } 'data': { 'pci': 'GuestDeviceIdPCI' } }
## ##
# @GuestDeviceInfo: # @GuestDeviceInfo:
@ -1284,6 +1284,7 @@
# @driver-name: name of the associated driver # @driver-name: name of the associated driver
# @driver-date: driver release date in format YYYY-MM-DD # @driver-date: driver release date in format YYYY-MM-DD
# @driver-version: driver version # @driver-version: driver version
# @id: device ID
# #
# Since: 5.2 # Since: 5.2
## ##
@ -1292,7 +1293,7 @@
'driver-name': 'str', 'driver-name': 'str',
'*driver-date': 'str', '*driver-date': 'str',
'*driver-version': 'str', '*driver-version': 'str',
'*address': 'GuestDeviceAddress' '*id': 'GuestDeviceId'
} } } }
## ##