External/libvirt
1
0
Fork 0
Code

conf: Adjust duplicate source host port check

Browse Source 
Only perform the port number check if the incoming definition actually
provides it. Since the port number is optional we could erroneously pass
a duplicate source host check since some storage pool backends which fill
in the default port number (e.g., iSCSI and sheepdog) for the started pool.
This commit is contained in:
John Ferlan 2015-05-11 10:19:39 -04:00
parent 5f6fe84d57
commit 6dd9297c88
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/storage_conf.c
View File

@ -2412,7 +2412,8 @@ virStoragePoolSourceMatchSingleHost(virStoragePoolSourcePtr poolsrc,
if (poolsrc->nhost != 1 && defsrc->nhost != 1) if (poolsrc->nhost != 1 && defsrc->nhost != 1)
return false; return false;
if (poolsrc->hosts[0].port != defsrc->hosts[0].port) if (defsrc->hosts[0].port &&
poolsrc->hosts[0].port != defsrc->hosts[0].port)
return false; return false;
return STREQ(poolsrc->hosts[0].name, defsrc->hosts[0].name); return STREQ(poolsrc->hosts[0].name, defsrc->hosts[0].name);