NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: hotplug: Drop 'secAlias' output parameter from qemuDomainGetTLSObjects

Browse Source 
No callers are using it.

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-29 20:17:04 +02:00
parent 4a9680432b
commit 6dc2059abe
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_hotplug.c
View File

@ -166,8 +166,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver,
src->tlsCertdir, src->tlsCertdir,
false, false,
src->tlsVerify, src->tlsVerify,
NULL, &tlsProps, NULL, NULL, &tlsProps, NULL, NULL) < 0)
NULL, NULL) < 0)
goto cleanup; goto cleanup;
if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
@ -1502,21 +1501,19 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
const char *srcAlias, const char *srcAlias,
virJSONValuePtr *tlsProps, virJSONValuePtr *tlsProps,
char **tlsAlias, char **tlsAlias,
virJSONValuePtr *secProps, virJSONValuePtr *secProps)
char **secAlias)
{ {
const char *secAlias = NULL;
if (secinfo) { if (secinfo) {
if (qemuBuildSecretInfoProps(secinfo, secProps) < 0) if (qemuBuildSecretInfoProps(secinfo, secProps) < 0)
return -1; return -1;
if (secAlias && secAlias = secinfo->s.aes.alias;
!(*secAlias = qemuDomainGetSecretAESAlias(srcAlias, false)))
return -1;
} }
if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify, if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify,
secAlias ? *secAlias : NULL, qemuCaps, secAlias, qemuCaps, tlsProps) < 0)
tlsProps) < 0)
return -1; return -1;
if (tlsAlias && if (tlsAlias &&
@ -1567,7 +1564,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr driver,
dev->data.tcp.listen, dev->data.tcp.listen,
cfg->chardevTLSx509verify, cfg->chardevTLSx509verify,
charAlias, &tlsProps, tlsAlias, charAlias, &tlsProps, tlsAlias,
&secProps, NULL) < 0) &secProps) < 0)
goto cleanup; goto cleanup;
dev->data.tcp.tlscreds = true; dev->data.tcp.tlscreds = true;

3
src/qemu/qemu_hotplug.h
View File

@ -56,8 +56,7 @@ int qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
const char *srcAlias, const char *srcAlias,
virJSONValuePtr *tlsProps, virJSONValuePtr *tlsProps,
char **tlsAlias, char **tlsAlias,
virJSONValuePtr *secProps, virJSONValuePtr *secProps);
char **secAlias);
int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver, int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,

2
src/qemu/qemu_migration_params.c
View File

@ -860,7 +860,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
cfg->migrateTLSx509certdir, tlsListen, cfg->migrateTLSx509certdir, tlsListen,
cfg->migrateTLSx509verify, cfg->migrateTLSx509verify,
QEMU_MIGRATION_TLS_ALIAS_BASE, QEMU_MIGRATION_TLS_ALIAS_BASE,
&tlsProps, tlsAlias, &secProps, NULL) < 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...