[libvirt] [PATCH v2 4/8] qemu: Move qemuDomainSecretDestroy to qemuProcessLaunch
Rather than need to call qemuDomainSecretDestroy after any call to
qemuProcessLaunch, let's do the destroy in qemuProcessLaunch since
that's where command line is eventually generated and processed. Once
it's generated, we can clear out the secrets.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_process.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index baabb31..91b4f45 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5571,6 +5571,7 @@ qemuProcessLaunch(virConnectPtr conn,
ret = 0;
cleanup:
+ qemuDomainSecretDestroy(vm);
virCommandFree(cmd);
qemuDomainLogContextFree(logCtxt);
virObjectUnref(cfg);
@@ -5683,8 +5684,6 @@ qemuProcessStart(virConnectPtr conn,
}
relabel = true;
- qemuDomainSecretDestroy(vm);
-
if (incoming &&
incoming->deferredURI &&
qemuMigrationRunIncoming(driver, vm, incoming->deferredURI, asyncJob) < 0)
--
2.5.5