From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 30 Jun 2015 08:14:17 +0000 (+0200)
Subject: conf: storage: Fix duplicate check for gluster pools
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ea1c7b652b2b0c6248d03d4b2ed5b3e8afbd8c1b;p=libvirt.git

conf: storage: Fix duplicate check for gluster pools

The pool name has to be the same too to warrant rejecting a pool
definition as duplicate. This regression was introduced in commit
2184ade3a0546b915252cb3b6a5dc88e9a8d2ccf.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1236438
---

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 4bbed4f3a7..a7476a30d7 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -2471,13 +2471,22 @@ virStoragePoolSourceFindDuplicate(virConnectPtr conn,
             if (STREQ(pool->def->target.path, def->target.path))
                 matchpool = pool;
             break;
-        case VIR_STORAGE_POOL_NETFS:
+
         case VIR_STORAGE_POOL_GLUSTER:
+            if (STREQ(pool->def->source.name, def->source.name) &&
+                STREQ_NULLABLE(pool->def->source.dir, def->source.dir) &&
+                virStoragePoolSourceMatchSingleHost(&pool->def->source,
+                                                    &def->source))
+                matchpool = pool;
+            break;
+
+        case VIR_STORAGE_POOL_NETFS:
             if (STREQ(pool->def->source.dir, def->source.dir) &&
                 virStoragePoolSourceMatchSingleHost(&pool->def->source,
                                                     &def->source))
                 matchpool = pool;
             break;
+
         case VIR_STORAGE_POOL_SCSI:
             if (pool->def->source.adapter.type ==
                 VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST &&