43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
|
From 97672f8da837bbe9e1a57714db3b2ce5f299b8d3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Fri, 22 Jan 2021 09:29:54 +0100
|
||
|
|
Subject: [PATCH 085/108] virsh: Fix XPATH in virshDomainDeviceAliasCompleter()
|
||
|
|
|
||
|
|
The way this completer works is that it dumps XML of specified
|
||
|
|
domain and then tries to look for @name attribute of <alias/>
|
||
|
|
element. However, the XPATH it uses is not correct which results
|
||
|
|
in no aliases returned by the completer.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
(cherry picked from commit f023a8acd9c08ea3bc72bf8f968ad63426b033bd)
|
||
|
|
---
|
||
|
|
tools/virsh-completer-domain.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
|
||
|
|
index 4472ee08f2..7e155d9ee2 100644
|
||
|
|
--- a/tools/virsh-completer-domain.c
|
||
|
|
+++ b/tools/virsh-completer-domain.c
|
||
|
|
@@ -266,7 +266,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl,
|
||
|
|
if (virshDomainGetXML(ctl, cmd, domainXMLFlags, &xmldoc, &ctxt) < 0)
|
||
|
|
return NULL;
|
||
|
|
|
||
|
|
- naliases = virXPathNodeSet("./devices//alias/@name", ctxt, &aliases);
|
||
|
|
+ naliases = virXPathNodeSet("/domain/devices//alias[@name]", ctxt, &aliases);
|
||
|
|
if (naliases < 0)
|
||
|
|
return NULL;
|
||
|
|
|
||
|
|
@@ -274,7 +274,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl,
|
||
|
|
return NULL;
|
||
|
|
|
||
|
|
for (i = 0; i < naliases; i++) {
|
||
|
|
- if (!(tmp[i] = virXMLNodeContentString(aliases[i])))
|
||
|
|
+ if (!(tmp[i] = virXMLPropString(aliases[i], "name")))
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|