shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases 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,
false,
src->tlsVerify,
NULL, &tlsProps, NULL,
NULL, NULL) < 0)
NULL, &tlsProps, NULL, NULL) < 0)
goto cleanup;
if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
@ -1502,21 +1501,19 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
const char *srcAlias,
virJSONValuePtr *tlsProps,
char **tlsAlias,
virJSONValuePtr *secProps,
char **secAlias)
virJSONValuePtr *secProps)
{
const char *secAlias = NULL;
if (secinfo) {
if (qemuBuildSecretInfoProps(secinfo, secProps) < 0)
return -1;
if (secAlias &&
!(*secAlias = qemuDomainGetSecretAESAlias(srcAlias, false)))
return -1;
secAlias = secinfo->s.aes.alias;
}
if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify,
secAlias ? *secAlias : NULL, qemuCaps,
tlsProps) < 0)
secAlias, qemuCaps, tlsProps) < 0)
return -1;
if (tlsAlias &&
@ -1567,7 +1564,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr driver,
dev->data.tcp.listen,
cfg->chardevTLSx509verify,
charAlias, &tlsProps, tlsAlias,
&secProps, NULL) < 0)
&secProps) < 0)
goto cleanup;
dev->data.tcp.tlscreds = true;

3
src/qemu/qemu_hotplug.h
View File

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

2
src/qemu/qemu_migration_params.c
View File

@ -860,7 +860,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
cfg->migrateTLSx509certdir, tlsListen,
cfg->migrateTLSx509verify,
QEMU_MIGRATION_TLS_ALIAS_BASE,
&tlsProps, tlsAlias, &secProps, NULL) < 0)
&tlsProps, tlsAlias, &secProps) < 0)
goto error;
/* Ensure the domain doesn't already have the TLS objects defined...