openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virDomainDiskTranslateSourcePoolAuth: Take virStorageSourcePtr instead of virDomainDiskDefPtr 

Only 'def->src' was ever used in this function. Use the source directly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-02-05 12:39:41 +01:00
parent 47cad72553
commit 4fca8299c5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/domain_conf.c
View File

@ -31377,18 +31377,18 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src,
static int
virDomainDiskTranslateSourcePoolAuth(virDomainDiskDefPtr def,
virDomainDiskTranslateSourcePoolAuth(virStorageSourcePtr src,
virStoragePoolSourcePtr source)
{
/* Only necessary when authentication set */
if (!source->auth)
return 0;
def->src->auth = virStorageAuthDefCopy(source->auth);
if (!def->src->auth)
src->auth = virStorageAuthDefCopy(source->auth);
if (!src->auth)
return -1;
/* A <disk> doesn't use <auth type='%s', so clear that out for the disk */
def->src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE;
src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE;
return 0;
}
@ -31400,7 +31400,7 @@ virDomainDiskTranslateISCSIDirect(virDomainDiskDefPtr def,
def->src->srcpool->actualtype = VIR_STORAGE_TYPE_NETWORK;
def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
if (virDomainDiskTranslateSourcePoolAuth(def,
if (virDomainDiskTranslateSourcePoolAuth(def->src,
&pooldef->source) < 0)
return -1;