From: John Ferlan <jferlan@redhat.com>
Date: Fri, 10 Mar 2017 15:29:32 +0000 (-0500)
Subject: conf: Ensure both parent_wwnn/parent_wwpn provided
X-Git-Tag: v3.2.0-rc1~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d21fc7093803f88624dec99a5eb14055235986e5;p=thirdparty%2Flibvirt.git

conf: Ensure both parent_wwnn/parent_wwpn provided

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

Commit id 'bb74a7ffe' neglected to check that both the parent_wwnn
parent_wwpn are in the XML if one or the other is similar to how
the node device code checked (commit id '2b13361bc').

If only one is provided, the "default" is to use a vHBA capable
adapter (see commit id '78be2e8b'), so the vHBA could start, but
perhaps not on the expected adapter.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 3cfaf2b9bc..68def65bf9 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -941,6 +941,25 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
             if (!virValidateWWN(ret->source.adapter.data.fchost.wwnn) ||
                 !virValidateWWN(ret->source.adapter.data.fchost.wwpn))
                 goto error;
+
+            if ((ret->source.adapter.data.fchost.parent_wwnn &&
+                 !ret->source.adapter.data.fchost.parent_wwpn)) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("when providing parent_wwnn='%s', the "
+                                 "parent_wwpn must also be provided"),
+                               ret->source.adapter.data.fchost.parent_wwnn);
+                goto error;
+            }
+
+            if (!ret->source.adapter.data.fchost.parent_wwnn &&
+                 ret->source.adapter.data.fchost.parent_wwpn) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("when providing parent_wwpn='%s', the "
+                                 "parent_wwnn must also be provided"),
+                               ret->source.adapter.data.fchost.parent_wwpn);
+                goto error;
+            }
+
         } else if (ret->source.adapter.type ==
                    VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST) {
             if (!ret->source.adapter.data.scsi_host.name &&