mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-08 16:54:49 +00:00
qemuDomainSecretStorageSourcePrepare: Fix naming of alias variables
The naming of the variables was tied to what they are used for not what the alias represents. Since we'll need to use some of the aliases for another type of secrets fix the name so that it makes sense. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
bb2a81df21
commit
b05322fc03
@ -1751,8 +1751,8 @@ qemuDomainDiskHasEncryptionSecret(virStorageSourcePtr src)
|
|||||||
static int
|
static int
|
||||||
qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
|
qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
|
||||||
virStorageSourcePtr src,
|
virStorageSourcePtr src,
|
||||||
const char *authalias,
|
const char *aliasprotocol,
|
||||||
const char *encalias)
|
const char *aliasformat)
|
||||||
{
|
{
|
||||||
qemuDomainStorageSourcePrivatePtr srcPriv;
|
qemuDomainStorageSourcePrivatePtr srcPriv;
|
||||||
bool iscsiHasPS = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET);
|
bool iscsiHasPS = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET);
|
||||||
@ -1779,7 +1779,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
|
|||||||
src->auth->username,
|
src->auth->username,
|
||||||
&src->auth->seclookupdef);
|
&src->auth->seclookupdef);
|
||||||
} else {
|
} else {
|
||||||
srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv, authalias,
|
srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasprotocol,
|
||||||
usageType,
|
usageType,
|
||||||
src->auth->username,
|
src->auth->username,
|
||||||
&src->auth->seclookupdef,
|
&src->auth->seclookupdef,
|
||||||
@ -1791,7 +1791,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (hasEnc) {
|
if (hasEnc) {
|
||||||
if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv, encalias,
|
if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasformat,
|
||||||
VIR_SECRET_USAGE_TYPE_VOLUME,
|
VIR_SECRET_USAGE_TYPE_VOLUME,
|
||||||
NULL,
|
NULL,
|
||||||
&src->encryption->secrets[0]->seclookupdef,
|
&src->encryption->secrets[0]->seclookupdef,
|
||||||
|
Loading…
Reference in New Issue
Block a user