From: John Ferlan <jferlan@redhat.com>
Date: Thu, 26 Feb 2015 16:22:17 +0000 (-0500)
Subject: virsh: Adjust domblklist to understand disk volume syntax
X-Git-Tag: v1.2.14-rc1~302
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09aec2a456db8f9464edde61af673648d07d5b80;p=thirdparty%2Flibvirt.git

virsh: Adjust domblklist to understand disk volume syntax

A disk using a source pool is listed as having a source '-' in domblklist
because it doesn't check the right XML syntax to find the source.

Add a check for "./source/volume" which is where the "path" (of sorts)
to the volume name is described.
---

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 925eb1bbba..3c16b3eab9 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -531,7 +531,8 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd)
         source = virXPathString("string(./source/@file"
                                 "|./source/@dev"
                                 "|./source/@dir"
-                                "|./source/@name)", ctxt);
+                                "|./source/@name"
+                                "|./source/@volume)", ctxt);
         if (details) {
             vshPrint(ctl, "%-10s %-10s %-10s %s\n", type, device,
                      target, source ? source : "-");