From: John Ferlan <jferlan@redhat.com>
Date: Thu, 28 May 2015 18:29:19 +0000 (-0400)
Subject: virsh: Fix printing of XML for pool-create-as
X-Git-Tag: v1.2.17-rc1~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cffc099356f0ce1bb94d9d009aa49a99b9001d3c;p=thirdparty%2Flibvirt.git

virsh: Fix printing of XML for pool-create-as

https://bugzilla.redhat.com/show_bug.cgi?id=1224088

commit id 'bd00e00e' neglected to add the new adapter source options
into the if condition that allowed printing the <source> XML fields.
The <adapter type='fc_host'.../> doesn't require other options in order
to be complete.
---

diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 4865831c95..b420fe20a2 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -284,7 +284,8 @@ vshBuildPoolXML(vshControl *ctl,
     virBufferAsprintf(&buf, "<pool type='%s'>\n", type);
     virBufferAdjustIndent(&buf, 2);
     virBufferAsprintf(&buf, "<name>%s</name>\n", name);
-    if (srcHost || srcPath || srcDev || srcFormat || srcName) {
+    if (srcHost || srcPath || srcDev || srcFormat || srcName ||
+        (adapterWwnn && adapterWwpn) || adapterName) {
         virBufferAddLit(&buf, "<source>\n");
         virBufferAdjustIndent(&buf, 2);