From: John Ferlan <jferlan@redhat.com>
Date: Thu, 2 Apr 2015 16:46:00 +0000 (-0400)
Subject: storage: Add duplicate host check for Sheepdog pool def
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=521add056e69b82001cc2ceb4d8940ffabe6dee9;p=libvirt.git

storage: Add duplicate host check for Sheepdog pool def

Check the proposed pool source host XML definition against existing sheepdog
pools to ensure the incoming definition doesn't use the same source host XML
definition as an existing pool.
---

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 1fadff4955..2b2104d536 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -2544,9 +2544,13 @@ virStoragePoolSourceFindDuplicate(virConnectPtr conn,
         case VIR_STORAGE_POOL_DISK:
             matchpool = virStoragePoolSourceFindDuplicateDevices(pool, def);
             break;
+        case VIR_STORAGE_POOL_SHEEPDOG:
+            if (virStoragePoolSourceMatchSingleHost(&pool->def->source,
+                                                    &def->source))
+                matchpool = pool;
+            break;
         case VIR_STORAGE_POOL_MPATH:
         case VIR_STORAGE_POOL_RBD:
-        case VIR_STORAGE_POOL_SHEEPDOG:
         case VIR_STORAGE_POOL_GLUSTER:
         case VIR_STORAGE_POOL_ZFS:
         case VIR_STORAGE_POOL_LAST: