External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: hotplug: Remove TLS alias generation from qemuDomainGetTLSObjects

Browse Source 
Callers should generate the alias separately.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-05-30 09:24:35 +02:00
parent 6dc2059abe
commit 903ba2e807
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_hotplug.c
View File

@ -166,7 +166,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver,
src->tlsCertdir, src->tlsCertdir,
false, false,
src->tlsVerify, src->tlsVerify,
NULL, &tlsProps, NULL, NULL) < 0) &tlsProps, NULL) < 0)
goto cleanup; goto cleanup;
if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
@ -1498,9 +1498,7 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
const char *tlsCertdir, const char *tlsCertdir,
bool tlsListen, bool tlsListen,
bool tlsVerify, bool tlsVerify,
const char *srcAlias,
virJSONValuePtr *tlsProps, virJSONValuePtr *tlsProps,
char **tlsAlias,
virJSONValuePtr *secProps) virJSONValuePtr *secProps)
{ {
const char *secAlias = NULL; const char *secAlias = NULL;
@ -1516,10 +1514,6 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
secAlias, qemuCaps, tlsProps) < 0) secAlias, qemuCaps, tlsProps) < 0)
return -1; return -1;
if (tlsAlias &&
!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(srcAlias)))
return -1;
return 0; return 0;
} }
@ -1559,12 +1553,14 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr driver,
if (secinfo) if (secinfo)
*secAlias = secinfo->s.aes.alias; *secAlias = secinfo->s.aes.alias;
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias)))
goto cleanup;
if (qemuDomainGetTLSObjects(priv->qemuCaps, secinfo, if (qemuDomainGetTLSObjects(priv->qemuCaps, secinfo,
cfg->chardevTLSx509certdir, cfg->chardevTLSx509certdir,
dev->data.tcp.listen, dev->data.tcp.listen,
cfg->chardevTLSx509verify, cfg->chardevTLSx509verify,
charAlias, &tlsProps, tlsAlias, &tlsProps, &secProps) < 0)
&secProps) < 0)
goto cleanup; goto cleanup;
dev->data.tcp.tlscreds = true; dev->data.tcp.tlscreds = true;

2
src/qemu/qemu_hotplug.h
View File

@ -53,9 +53,7 @@ int qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
const char *tlsCertdir, const char *tlsCertdir,
bool tlsListen, bool tlsListen,
bool tlsVerify, bool tlsVerify,
const char *srcAlias,
virJSONValuePtr *tlsProps, virJSONValuePtr *tlsProps,
char **tlsAlias,
virJSONValuePtr *secProps); virJSONValuePtr *secProps);
int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver, int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,

6
src/qemu/qemu_migration_params.c
View File

@ -856,11 +856,13 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
secAlias = priv->migSecinfo->s.aes.alias; secAlias = priv->migSecinfo->s.aes.alias;
} }
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE)))
goto error;
if (qemuDomainGetTLSObjects(priv->qemuCaps, priv->migSecinfo, if (qemuDomainGetTLSObjects(priv->qemuCaps, priv->migSecinfo,
cfg->migrateTLSx509certdir, tlsListen, cfg->migrateTLSx509certdir, tlsListen,
cfg->migrateTLSx509verify, cfg->migrateTLSx509verify,
QEMU_MIGRATION_TLS_ALIAS_BASE, &tlsProps, &secProps) < 0)
&tlsProps, tlsAlias, &secProps) < 0)
goto error; goto error;
/* Ensure the domain doesn't already have the TLS objects defined... /* Ensure the domain doesn't already have the TLS objects defined...