NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virshFindDisk: Use virXPathNodeSet instead of xmlXPathEval

Browse Source 
Don't open-code the XPath lookup.

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:21:23 +02:00
parent 3dd4971e29
commit da31579d0b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/virsh-domain.c
View File

@ -12639,8 +12639,9 @@ virshFindDisk(const char *doc,
int type) int type)
{ {
g_autoptr(xmlDoc) xml = NULL; g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathObject) obj = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL; g_autoptr(xmlXPathContext) ctxt = NULL;
g_autofree xmlNodePtr *nodes = NULL;
ssize_t nnodes;
xmlNodePtr cur = NULL; xmlNodePtr cur = NULL;
size_t i; size_t i;
@ -12650,21 +12651,17 @@ virshFindDisk(const char *doc,
return NULL; return NULL;
} }
obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); if ((nnodes = virXPathNodeSet("/domain/devices/disk", ctxt, &nodes)) <= 0) {
if (obj == NULL ||
obj->type != XPATH_NODESET ||
obj->nodesetval == NULL ||
obj->nodesetval->nodeNr == 0) {
vshError(NULL, "%s", _("Failed to get disk information")); vshError(NULL, "%s", _("Failed to get disk information"));
return NULL; return NULL;
} }
/* search disk using @path */ /* search disk using @path */
for (i = 0; i < obj->nodesetval->nodeNr; i++) { for (i = 0; i < nnodes; i++) {
bool is_supported = true; bool is_supported = true;
if (type == VIRSH_FIND_DISK_CHANGEABLE) { if (type == VIRSH_FIND_DISK_CHANGEABLE) {
xmlNodePtr n = obj->nodesetval->nodeTab[i]; xmlNodePtr n = nodes[i];
is_supported = false; is_supported = false;
/* Check if the disk is CDROM or floppy disk */ /* Check if the disk is CDROM or floppy disk */
@ -12680,7 +12677,7 @@ virshFindDisk(const char *doc,
continue; continue;
} }
cur = obj->nodesetval->nodeTab[i]->children; cur = nodes[i]->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
g_autofree char *tmp = NULL; g_autofree char *tmp = NULL;
@ -12696,7 +12693,7 @@ virshFindDisk(const char *doc,
} }
if (STREQ_NULLABLE(tmp, path)) { if (STREQ_NULLABLE(tmp, path)) {
xmlNodePtr ret = xmlCopyNode(obj->nodesetval->nodeTab[i], 1); xmlNodePtr ret = xmlCopyNode(nodes[i], 1);
/* drop backing store since they are not needed here */ /* drop backing store since they are not needed here */
virshDiskDropBackingStore(ret); virshDiskDropBackingStore(ret);
return ret; return ret;