External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-06 20:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

virshFindDisk: Sanitize removable media check

Browse Source 
The XPath lookup guarantees that the top level element is always 'disk'
so there's no need to check that it actually is. We can also remove the
two unnecessary temporary variables.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-10-19 13:31:00 +02:00
parent da31579d0b
commit a5911fd808
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/virsh-domain.c
View File

@ -12658,22 +12658,13 @@ virshFindDisk(const char *doc,
/* search disk using @path */
for (i = 0; i < nnodes; i++) {
bool is_supported = true;
if (type == VIRSH_FIND_DISK_CHANGEABLE) {
xmlNodePtr n = nodes[i];
is_supported = false;
g_autofree char *device = virXMLPropString(nodes[i], "device");
/* Check if the disk is CDROM or floppy disk */
if (virXMLNodeNameEqual(n, "disk")) {
g_autofree char *device_value = virXMLPropString(n, "device");
if (STREQ(device_value, "cdrom") ||
STREQ(device_value, "floppy"))
is_supported = true;
}
if (!is_supported)
if (device &&
STRNEQ(device, "cdrom") &&
STRNEQ(device, "floppy"))
continue;
}