External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Don't allocate storage source private data if not needed

Browse Source
This commit is contained in:
Peter Krempa 2017-11-09 12:54:43 +01:00
parent 8056721cbb
commit 2c82fddca9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_domain.c
View File

@ -1402,13 +1402,18 @@ qemuDomainSecretStorageSourcePrepare(virConnectPtr conn,
const char *encalias) const char *encalias)
{ {
qemuDomainStorageSourcePrivatePtr srcPriv; qemuDomainStorageSourcePrivatePtr srcPriv;
bool hasAuth = qemuDomainSecretDiskCapable(src);
bool hasEnc = qemuDomainDiskHasEncryptionSecret(src);
if (!hasAuth && !hasEnc)
return 0;
if (!(src->privateData = qemuDomainStorageSourcePrivateNew())) if (!(src->privateData = qemuDomainStorageSourcePrivateNew()))
return -1; return -1;
srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
if (qemuDomainSecretDiskCapable(src)) { if (hasAuth) {
virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI; virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI;
if (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) if (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD)
@ -1421,7 +1426,7 @@ qemuDomainSecretStorageSourcePrepare(virConnectPtr conn,
return -1; return -1;
} }
if (qemuDomainDiskHasEncryptionSecret(src)) { if (hasEnc) {
if (!(srcPriv->encinfo = if (!(srcPriv->encinfo =
qemuDomainSecretInfoNew(conn, priv, encalias, qemuDomainSecretInfoNew(conn, priv, encalias,
VIR_SECRET_USAGE_TYPE_VOLUME, NULL, VIR_SECRET_USAGE_TYPE_VOLUME, NULL,