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

qga: update schema for guest-get-disks 'dependents' field

Browse Source 
The recently-added 'guest-get-disk' command returns a list of
GuestDiskInfo entries, which in turn have a 'dependents' field which
lists devices these entries are dependent upon. Thus, 'dependencies'
is a better name for this field. Address this by renaming the field
accordingly.

Additionally, 'dependents' is specified as non-optional, even though
it's not implemented for w32. This is misleading, since it gives users
the impression that a particular disk might not have dependencies,
when in reality that information is simply not known to the guest
agent. Address this by making 'dependents' an optional field, and only
marking it as in-use when the facilities to obtain this information are
available to the guest agent.

Cc: Eric Blake <eblake@redhat.com>
Cc: Tomáš Golembiovský <tgolembi@redhat.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>
This commit is contained in:
Michael Roth 2020-11-13 11:18:14 -06:00
parent 2f7c9dd518
commit a8aa94b5f8
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qga/commands-posix.c
View File

@ -1285,6 +1285,7 @@ static void get_disk_deps(const char *disk_dir, GuestDiskInfo *disk)
g_debug("failed to list entries in %s", deps_dir); g_debug("failed to list entries in %s", deps_dir);
return; return;
} }
disk->has_dependencies = true;
while ((dep = g_dir_read_name(dp_deps)) != NULL) { while ((dep = g_dir_read_name(dp_deps)) != NULL) {
g_autofree char *dep_dir = NULL; g_autofree char *dep_dir = NULL;
strList *dep_item = NULL; strList *dep_item = NULL;
@ -1297,8 +1298,8 @@ static void get_disk_deps(const char *disk_dir, GuestDiskInfo *disk)
g_debug(" adding dependent device: %s", dev_name); g_debug(" adding dependent device: %s", dev_name);
dep_item = g_new0(strList, 1); dep_item = g_new0(strList, 1);
dep_item->value = dev_name; dep_item->value = dev_name;
dep_item->next = disk->dependents; dep_item->next = disk->dependencies;
disk->dependents = dep_item; disk->dependencies = dep_item;
} }
} }
g_dir_close(dp_deps); g_dir_close(dp_deps);
@ -1351,8 +1352,9 @@ static GuestDiskInfoList *get_disk_partitions(
partition->name = dev_name; partition->name = dev_name;
partition->partition = true; partition->partition = true;
/* Add parent disk as dependent for easier tracking of hierarchy */ /* Add parent disk as dependent for easier tracking of hierarchy */
partition->dependents = g_new0(strList, 1); partition->dependencies = g_new0(strList, 1);
partition->dependents->value = g_strdup(disk_dev); partition->dependencies->value = g_strdup(disk_dev);
partition->has_dependencies = true;
item = g_new0(GuestDiskInfoList, 1); item = g_new0(GuestDiskInfoList, 1);
item->value = partition; item->value = partition;

8
qga/qapi-schema.json
View File

@ -870,9 +870,9 @@
# #
# @name: device node (Linux) or device UNC (Windows) # @name: device node (Linux) or device UNC (Windows)
# @partition: whether this is a partition or disk # @partition: whether this is a partition or disk
# @dependents: list of dependent devices; e.g. for LVs of the LVM this will # @dependencies: list of device dependencies; e.g. for LVs of the LVM this will
# hold the list of PVs, for LUKS encrypted volume this will # hold the list of PVs, for LUKS encrypted volume this will
# contain the disk where the volume is placed. (Linux) # contain the disk where the volume is placed. (Linux)
# @address: disk address information (only for non-virtual devices) # @address: disk address information (only for non-virtual devices)
# @alias: optional alias assigned to the disk, on Linux this is a name assigned # @alias: optional alias assigned to the disk, on Linux this is a name assigned
# by device mapper # by device mapper
@ -880,7 +880,7 @@
# Since 5.2 # Since 5.2
## ##
{ 'struct': 'GuestDiskInfo', { 'struct': 'GuestDiskInfo',
'data': {'name': 'str', 'partition': 'bool', 'dependents': ['str'], 'data': {'name': 'str', 'partition': 'bool', '*dependencies': ['str'],
'*address': 'GuestDiskAddress', '*alias': 'str'} } '*address': 'GuestDiskAddress', '*alias': 'str'} }
## ##