External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: process: Move TLS setup for storage source to qemuProcessPrepareDomainStorage

Browse Source
This commit is contained in:
Peter Krempa 2017-10-03 13:16:05 +02:00
parent f1cec8829e
commit 0c09c5b0d1
3 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_domain.c
View File

@ -7720,29 +7720,6 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
} }
/* 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 int
qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem)
{ {

5
src/qemu/qemu_domain.h
View File

@ -873,11 +873,6 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
virQEMUDriverConfigPtr cfg) virQEMUDriverConfigPtr cfg)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
int
qemuDomainPrepareDiskSource(virDomainDefPtr def,
virQEMUDriverConfigPtr cfg)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);

10
src/qemu/qemu_process.c
View File

@ -5288,6 +5288,7 @@ static int
qemuProcessPrepareDomainStorage(virConnectPtr conn, qemuProcessPrepareDomainStorage(virConnectPtr conn,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virQEMUDriverConfigPtr cfg,
unsigned int flags) unsigned int flags)
{ {
size_t i; size_t i;
@ -5304,6 +5305,9 @@ qemuProcessPrepareDomainStorage(virConnectPtr conn,
/* disk source was dropped */ /* disk source was dropped */
continue; continue;
} }
if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) < 0)
return -1;
} }
return 0; return 0;
@ -5387,7 +5391,7 @@ qemuProcessPrepareDomain(virConnectPtr conn,
goto cleanup; goto cleanup;
VIR_DEBUG("Setting up storage"); VIR_DEBUG("Setting up storage");
if (qemuProcessPrepareDomainStorage(conn, driver, vm, flags) < 0) if (qemuProcessPrepareDomainStorage(conn, driver, vm, cfg, flags) < 0)
goto cleanup; goto cleanup;
/* Drop possibly missing disks from the definition. */ /* Drop possibly missing disks from the definition. */
@ -5398,10 +5402,6 @@ qemuProcessPrepareDomain(virConnectPtr conn,
if (qemuDomainMasterKeyCreate(vm) < 0) if (qemuDomainMasterKeyCreate(vm) < 0)
goto cleanup; 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"); VIR_DEBUG("Prepare chardev source backends for TLS");
qemuDomainPrepareChardevSource(vm->def, cfg); qemuDomainPrepareChardevSource(vm->def, cfg);