提交 5c09486c 编写于 作者: J John Ferlan

qemu: Introduce qemuDomainPrepareDiskSource

Introduce a function to setup any TLS needs for a disk source.

If there's a configuration or other error setting up the disk source
for TLS, then cause the domain startup to fail.

For VxHS, follow the chardevTLS model where if the src->haveTLS hasn't
been configured, then take the system/global cfg->haveTLS setting for
the storage source *and* mark that we've done so via the tlsFromConfig
setting in storage source.

Next, if we are using TLS, then generate an alias into a virStorageSource
'tlsAlias' field that will be used to create the TLS object and added to
the disk object in order to link the two together for QEMU.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 f1705485
......@@ -7661,6 +7661,79 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def,
}
/* qemuProcessPrepareDiskSourceTLS:
* @source: pointer to host interface data for disk device
* @diskAlias: alias use for the disk device
* @cfg: driver configuration
*
* Updates host interface TLS encryption setting based on qemu.conf
* for disk devices. This will be presented as "tls='yes|no'" in
* live XML of a guest.
*
* Returns 0 on success, -1 on bad config/failure
*/
int
qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
const char *diskAlias,
virQEMUDriverConfigPtr cfg)
{
/* VxHS uses only client certificates and thus has no need for
* the server-key.pem nor a secret that could be used to decrypt
* the it, so no need to add a secinfo for a secret UUID. */
if (src->type == VIR_STORAGE_TYPE_NETWORK &&
src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS) {
if (src->haveTLS == VIR_TRISTATE_BOOL_ABSENT) {
if (cfg->vxhsTLS)
src->haveTLS = VIR_TRISTATE_BOOL_YES;
else
src->haveTLS = VIR_TRISTATE_BOOL_NO;
src->tlsFromConfig = true;
}
if (src->haveTLS == VIR_TRISTATE_BOOL_YES) {
if (!diskAlias) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("disk does not have an alias"));
return -1;
}
/* Grab the vxhsTLSx509certdir and set the verify/listen values.
* NB: tlsAlias filled in during qemuDomainGetTLSObjects. */
if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0)
return -1;
src->tlsVerify = true;
}
}
return 0;
}
/* qemuProcessPrepareDiskSource:
* @def: live domain definition
* @driver: qemu driver
*
* Returns 0 on success, -1 on failure
*/
int
qemuDomainPrepareDiskSource(virDomainDefPtr def,
virQEMUDriverConfigPtr cfg)
{
size_t i;
for (i = 0; i < def->ndisks; i++) {
if (qemuDomainPrepareDiskSourceTLS(def->disks[i]->src,
def->disks[i]->info.alias,
cfg) < 0)
return -1;
}
return 0;
}
int
qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem)
......
......@@ -863,6 +863,17 @@ void qemuDomainPrepareChardevSource(virDomainDefPtr def,
virQEMUDriverConfigPtr cfg)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int
qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
const char *diskAlias,
virQEMUDriverConfigPtr cfg)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
int
qemuDomainPrepareDiskSource(virDomainDefPtr def,
virQEMUDriverConfigPtr cfg)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem)
ATTRIBUTE_NONNULL(1);
......
......@@ -5357,6 +5357,10 @@ qemuProcessPrepareDomain(virConnectPtr conn,
if (qemuDomainMasterKeyCreate(vm) < 0)
goto cleanup;
VIR_DEBUG("Prepare disk source backends for TLS");
if (qemuDomainPrepareDiskSource(vm->def, cfg) < 0)
goto cleanup;
VIR_DEBUG("Prepare chardev source backends for TLS");
qemuDomainPrepareChardevSource(vm->def, cfg);
......
......@@ -2041,6 +2041,7 @@ virStorageSourceCopy(const virStorageSource *src,
ret->shared = src->shared;
ret->haveTLS = src->haveTLS;
ret->tlsFromConfig = src->tlsFromConfig;
ret->tlsVerify = src->tlsVerify;
/* storage driver metadata are not copied */
ret->drv = NULL;
......@@ -2054,7 +2055,9 @@ virStorageSourceCopy(const virStorageSource *src,
VIR_STRDUP(ret->configFile, src->configFile) < 0 ||
VIR_STRDUP(ret->nodeformat, src->nodeformat) < 0 ||
VIR_STRDUP(ret->nodestorage, src->nodestorage) < 0 ||
VIR_STRDUP(ret->compat, src->compat) < 0)
VIR_STRDUP(ret->compat, src->compat) < 0 ||
VIR_STRDUP(ret->tlsAlias, src->tlsAlias) < 0 ||
VIR_STRDUP(ret->tlsCertdir, src->tlsCertdir) < 0)
goto error;
if (src->nhosts) {
......@@ -2279,6 +2282,9 @@ virStorageSourceClear(virStorageSourcePtr def)
virStorageSourceBackingStoreClear(def);
VIR_FREE(def->tlsAlias);
VIR_FREE(def->tlsCertdir);
memset(def, 0, sizeof(*def));
}
......
......@@ -288,6 +288,13 @@ struct _virStorageSource {
/* Indication whether the haveTLS value was altered due to qemu.conf
* setting when haveTLS is missing from the domain config file */
bool tlsFromConfig;
/* If TLS is used, then mgmt of the TLS credentials occurs via an
* object that is generated using a specific alias for a specific
* certificate directory with listen and verify bools. */
char *tlsAlias;
char *tlsCertdir;
bool tlsVerify;
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册