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: Introduce qemuDomainSecretInfoTLSNew

Browse Source 
Building upon the qemuDomainSecretInfoNew, create a helper which will
build the secret used for TLS.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-03-01 14:14:40 -05:00
parent c9a7b7b6ea
commit 7c2b7891cc
1 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/qemu/qemu_domain.c
View File

@ -1158,6 +1158,40 @@ qemuDomainSecretInfoNew(virConnectPtr conn,
} }
/**
* qemuDomainSecretInfoTLSNew:
* @conn: Pointer to connection
* @priv: pointer to domain private object
* @srcAlias: Alias base to use for TLS object
* @secretUUID: Provide a secretUUID value to look up/create the secretInfo
*
* Using the passed @secretUUID, generate a seclookupdef that can be used
* to generate the returned qemuDomainSecretInfoPtr for a TLS based secret.
*
* Returns qemuDomainSecretInfoPtr or NULL on error.
*/
static qemuDomainSecretInfoPtr
qemuDomainSecretInfoTLSNew(virConnectPtr conn,
qemuDomainObjPrivatePtr priv,
const char *srcAlias,
const char *secretUUID)
{
virSecretLookupTypeDef seclookupdef = {0};
if (virUUIDParse(secretUUID, seclookupdef.u.uuid) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("malformed TLS secret uuid '%s' provided"),
secretUUID);
return NULL;
}
seclookupdef.type = VIR_SECRET_LOOKUP_TYPE_UUID;
return qemuDomainSecretInfoNew(conn, priv, srcAlias,
VIR_SECRET_USAGE_TYPE_TLS, NULL,
&seclookupdef, false);
}
/* qemuDomainSecretDiskDestroy: /* qemuDomainSecretDiskDestroy:
* @disk: Pointer to a disk definition * @disk: Pointer to a disk definition
* *
@ -1337,7 +1371,6 @@ qemuDomainSecretChardevPrepare(virConnectPtr conn,
const char *chrAlias, const char *chrAlias,
virDomainChrSourceDefPtr dev) virDomainChrSourceDefPtr dev)
{ {
virSecretLookupTypeDef seclookupdef = {0};
char *charAlias = NULL; char *charAlias = NULL;
if (dev->type != VIR_DOMAIN_CHR_TYPE_TCP) if (dev->type != VIR_DOMAIN_CHR_TYPE_TCP)
@ -1348,31 +1381,19 @@ qemuDomainSecretChardevPrepare(virConnectPtr conn,
qemuDomainChrSourcePrivatePtr chrSourcePriv = qemuDomainChrSourcePrivatePtr chrSourcePriv =
QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev); QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev);
if (virUUIDParse(cfg->chardevTLSx509secretUUID,
seclookupdef.u.uuid) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("malformed chardev TLS secret uuid in qemu.conf"));
return -1;
}
seclookupdef.type = VIR_SECRET_LOOKUP_TYPE_UUID;
if (!(charAlias = qemuAliasChardevFromDevAlias(chrAlias))) if (!(charAlias = qemuAliasChardevFromDevAlias(chrAlias)))
return -1; return -1;
if (!(chrSourcePriv->secinfo = chrSourcePriv->secinfo =
qemuDomainSecretInfoNew(conn, priv, charAlias, qemuDomainSecretInfoTLSNew(conn, priv, charAlias,
VIR_SECRET_USAGE_TYPE_TLS, NULL, cfg->chardevTLSx509secretUUID);
&seclookupdef, false)))
goto error;
VIR_FREE(charAlias); VIR_FREE(charAlias);
if (!chrSourcePriv->secinfo)
return -1;
} }
return 0; return 0;
error:
VIR_FREE(charAlias);
return -1;
} }