|
 |
9119d9 |
From afd72a7855f7d9e8411d7b876d18d8dda5864d96 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <afd72a7855f7d9e8411d7b876d18d8dda5864d96@dist-git>
|
|
|
9119d9 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
9119d9 |
Date: Sat, 1 Nov 2014 17:57:22 -0400
|
|
|
9119d9 |
Subject: [PATCH] Relax duplicate SCSI host pool checking
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1146837
|
|
|
9119d9 |
|
|
|
9119d9 |
Since commit 3f99d64 no new scsi_host pools can be defined
|
|
|
9119d9 |
if one of the already defined scsi_host pools does not refer
|
|
|
9119d9 |
to an accessible scsi_host adapter.
|
|
|
9119d9 |
|
|
|
9119d9 |
Relax the check by skipping over these inaccessible pools
|
|
|
9119d9 |
when checking for duplicates.
|
|
|
9119d9 |
|
|
|
9119d9 |
(cherry picked from commit 593892314a194df22ea54e5b9606e2a188932439)
|
|
|
9119d9 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/conf/storage_conf.c | 6 +-----
|
|
|
9119d9 |
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
|
|
|
9119d9 |
index d614b2d..67b44b9 100644
|
|
|
9119d9 |
--- a/src/conf/storage_conf.c
|
|
|
9119d9 |
+++ b/src/conf/storage_conf.c
|
|
|
9119d9 |
@@ -2174,7 +2174,7 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools,
|
|
|
9119d9 |
if (getSCSIHostNumber(pool->def->source.adapter,
|
|
|
9119d9 |
&pool_hostnum) < 0 ||
|
|
|
9119d9 |
getSCSIHostNumber(def->source.adapter, &def_hostnum) < 0)
|
|
|
9119d9 |
- goto error;
|
|
|
9119d9 |
+ break;
|
|
|
9119d9 |
if (pool_hostnum == def_hostnum)
|
|
|
9119d9 |
matchpool = pool;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
@@ -2216,10 +2216,6 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools,
|
|
|
9119d9 |
ret = -1;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
return ret;
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- error:
|
|
|
9119d9 |
- virStoragePoolObjUnlock(pool);
|
|
|
9119d9 |
- return -1;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
void
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.3
|
|
|
9119d9 |
|