qemu: domain: Introduce qemuDomainStartupCleanup

The new helper qemuDomainStartupCleanup is used to perform cleanup after
a startup of a VM (successful or not). The initial implementation just
calls qemuDomainSecretDestroy, which can be un-exported.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2d8ff652b0d29b4dc00250f03f6933bfbf1a9292..e6cbd4c0cb7599e9d503101cd2caec2971854049 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1576,7 +1576,7 @@ qemuDomainSecretGraphicsPrepare(virQEMUDriverConfig *cfg,
  *
  * Removes all unnecessary data which was needed to generate 'secret' objects.
  */
-void
+static void
 qemuDomainSecretDestroy(virDomainObj *vm)
 {
     size_t i;
@@ -12211,3 +12211,16 @@ qemuDomainSchedCoreStop(qemuDomainObjPrivate *priv)
         priv->schedCoreChildPID = -1;
     }
 }
+
+
+/**
+ * qemuDomainStartupCleanup:
+ *
+ * Performs a cleanup of data which is not required after a startup of a VM
+ * (successful or not).
+ */
+void
+qemuDomainStartupCleanup(virDomainObj *vm)
+{
+    qemuDomainSecretDestroy(vm);
+}

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 69b7e7da5d93c80b84673ebae77ec4434abba17a..11ef3e7b64f4afb0765c5ac9d4ddf2c83c54957f 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -925,8 +925,7 @@ int qemuDomainSecretChardevPrepare(virQEMUDriverConfig *cfg,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_NONNULL(4);
 
-void qemuDomainSecretDestroy(virDomainObj *vm)
-    ATTRIBUTE_NONNULL(1);
+void qemuDomainStartupCleanup(virDomainObj *vm);
 
 int qemuDomainSecretPrepare(virQEMUDriver *driver,
                             virDomainObj *vm)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index cc65e6befa9db76256e1e3673d09884ef14cf4a1..9fc7eada5220ae901132af93d56d0f2fc5fc320b 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7973,7 +7973,7 @@ qemuProcessLaunch(virConnectPtr conn,
 
  cleanup:
     qemuDomainSchedCoreStop(priv);
-    qemuDomainSecretDestroy(vm);
+    qemuDomainStartupCleanup(vm);
     return ret;
 }