src->tlsCertdir,
false,
src->tlsVerify,
- NULL, &tlsProps, NULL, NULL) < 0)
+ &tlsProps, NULL) < 0)
goto cleanup;
if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
const char *tlsCertdir,
bool tlsListen,
bool tlsVerify,
- const char *srcAlias,
virJSONValuePtr *tlsProps,
- char **tlsAlias,
virJSONValuePtr *secProps)
{
const char *secAlias = NULL;
secAlias, qemuCaps, tlsProps) < 0)
return -1;
- if (tlsAlias &&
- !(*tlsAlias = qemuAliasTLSObjFromSrcAlias(srcAlias)))
- return -1;
-
return 0;
}
if (secinfo)
*secAlias = secinfo->s.aes.alias;
+ if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias)))
+ goto cleanup;
+
if (qemuDomainGetTLSObjects(priv->qemuCaps, secinfo,
cfg->chardevTLSx509certdir,
dev->data.tcp.listen,
cfg->chardevTLSx509verify,
- charAlias, &tlsProps, tlsAlias,
- &secProps) < 0)
+ &tlsProps, &secProps) < 0)
goto cleanup;
dev->data.tcp.tlscreds = true;
const char *tlsCertdir,
bool tlsListen,
bool tlsVerify,
- const char *srcAlias,
virJSONValuePtr *tlsProps,
- char **tlsAlias,
virJSONValuePtr *secProps);
int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
secAlias = priv->migSecinfo->s.aes.alias;
}
+ if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE)))
+ goto error;
+
if (qemuDomainGetTLSObjects(priv->qemuCaps, priv->migSecinfo,
cfg->migrateTLSx509certdir, tlsListen,
cfg->migrateTLSx509verify,
- QEMU_MIGRATION_TLS_ALIAS_BASE,
- &tlsProps, tlsAlias, &secProps) < 0)
+ &tlsProps, &secProps) < 0)
goto error;
/* Ensure the domain doesn't already have the TLS objects defined...