OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qga: linux: return disk device in guest-get-fsinfo

Browse Source 
Report device node of the disk on Linux (e.g. "/dev/sda2").
Requirs libudev.

Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Tomáš Golembiovský 2018-10-23 13:23:12 +02:00 committed by Michael Roth
parent b616105a90
commit 6589ce3573
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qga/commands-posix.c
View File

@ -950,7 +950,12 @@ static void build_guest_fsinfo_for_real_device(char const *syspath,
if (udev == NULL || udevice == NULL) { if (udev == NULL || udevice == NULL) {
g_debug("failed to query udev"); g_debug("failed to query udev");
} else { } else {
const char *serial; const char *devnode, *serial;
devnode = udev_device_get_devnode(udevice);
if (devnode != NULL) {
disk->dev = g_strdup(devnode);
disk->has_dev = true;
}
serial = udev_device_get_property_value(udevice, "ID_SERIAL"); serial = udev_device_get_property_value(udevice, "ID_SERIAL");
if (serial != NULL && *serial != 0) { if (serial != NULL && *serial != 0) {
disk->serial = g_strdup(serial); disk->serial = g_strdup(serial);

3
qga/qapi-schema.json
View File

@ -835,6 +835,7 @@
# @target: target id # @target: target id
# @unit: unit id # @unit: unit id
# @serial: serial number (since: 3.1) # @serial: serial number (since: 3.1)
# @dev: device node (POSIX) or device UNC (Windows) (since: 3.1)
# #
# Since: 2.2 # Since: 2.2
## ##
@ -842,7 +843,7 @@
'data': {'pci-controller': 'GuestPCIAddress', 'data': {'pci-controller': 'GuestPCIAddress',
'bus-type': 'GuestDiskBusType', 'bus-type': 'GuestDiskBusType',
'bus': 'int', 'target': 'int', 'unit': 'int', 'bus': 'int', 'target': 'int', 'unit': 'int',
'*serial': 'str'} } '*serial': 'str', '*dev': 'str'} }
## ##
# @GuestFilesystemInfo: # @GuestFilesystemInfo: