[libvirt] [PATCH 08/10] qemu: hotplug: Refactor/simplify PR managed addition to VM

[Peter Krempa]

Similarly to qemuDomainDiskRemoveManagedPR make it enter monitor on
it's own so that it can be reused. Future users will be in the snapshot
code and in removable media change code.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_hotplug.c | 55 ++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 57ab753974..c751660403 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -310,29 +310,31 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,


 /**
- * qemuDomainMaybeStartPRDaemon:
+ * qemuHotplugAttachManagedPR:
+ * @driver: QEMU driver object
  * @vm: domain object
- * @disk: disk to hotplug
- * @retProps: properties of the managed pr-manager-helper object which needs
- *            to be added to the running vm
+ * @src: new disk source to be attached to @vm
+ * @asyncJob: asynchronous job identifier
  *
  * Checks if it's needed to start qemu-pr-helper and add the corresponding
  * pr-manager-helper object.
  *
- * Returns: 0 on success, -1 on error. If @retProps is populated the
- * qemu-pr-helper daemon was started.
+ * Returns: 0 on success, -1 on error.
  */
 static int
-qemuDomainDiskAttachManagedPR(virDomainObjPtr vm,
-                              virDomainDiskDefPtr disk,
-                              virJSONValuePtr *retProps)
+qemuHotplugAttachManagedPR(virQEMUDriverPtr driver,
+                           virDomainObjPtr vm,
+                           virStorageSourcePtr src,
+                           qemuDomainAsyncJob asyncJob)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
     virJSONValuePtr props = NULL;
+    bool daemonStarted = false;
     int ret = -1;
+    int rc;

     if (priv->prDaemonRunning ||
-        !virStorageSourceChainHasManagedPR(disk->src))
+        !virStorageSourceChainHasManagedPR(src))
         return 0;

     if (!(props = qemuBuildPRManagedManagerInfoProps(priv)))
@@ -341,10 +343,21 @@ qemuDomainDiskAttachManagedPR(virDomainObjPtr vm,
     if (qemuProcessStartManagedPRDaemon(vm) < 0)
         goto cleanup;

-    VIR_STEAL_PTR(*retProps, props);
+    daemonStarted = true;
+
+    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
+        goto cleanup;
+
+    rc = qemuMonitorAddObject(priv->mon, &props, NULL);
+
+    if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
+        goto cleanup;
+
     ret = 0;

  cleanup:
+    if (ret < 0 && daemonStarted)
+        qemuProcessKillManagedPRDaemon(vm);
     virJSONValueFree(props);
     return ret;
 }
@@ -592,7 +605,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     int ret = -1;
     qemuDomainObjPrivatePtr priv = vm->privateData;
     qemuHotplugDiskSourceDataPtr diskdata = NULL;
-    virErrorPtr orig_err;
     char *devstr = NULL;
     char *managedPrmgrAlias = NULL;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
@@ -607,9 +619,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)
         goto error;

-    if (qemuDomainDiskAttachManagedPR(vm, disk, &managedPrmgrProps) < 0)
-        goto error;
-
     if (!(diskdata = qemuHotplugDiskSourceAttachPrepare(disk, priv->qemuCaps)))
         goto error;

@@ -619,11 +628,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0)
         goto error;

-    qemuDomainObjEnterMonitor(driver, vm);
+    if (qemuHotplugAttachManagedPR(driver, vm, disk->src, QEMU_ASYNC_JOB_NONE) < 0)
+        goto error;

-    if (managedPrmgrProps &&
-        qemuMonitorAddObject(priv->mon, &managedPrmgrProps, &managedPrmgrAlias) < 0)
-        goto exit_monitor;
+    qemuDomainObjEnterMonitor(driver, vm);

     if (qemuHotplugDiskSoureceAttach(priv->mon, diskdata) < 0)
         goto exit_monitor;
@@ -653,20 +661,15 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
  exit_monitor:
     qemuHotplugDiskSourceRemove(priv->mon, diskdata);

-    virErrorPreserveLast(&orig_err);
-    if (managedPrmgrAlias)
-        ignore_value(qemuMonitorDelObject(priv->mon, managedPrmgrAlias));
     if (qemuDomainObjExitMonitor(driver, vm) < 0)
         ret = -2;
-    virErrorRestore(&orig_err);
+    if (qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
+        ret = -2;

     virDomainAuditDisk(vm, NULL, disk->src, "attach", false);

  error:
     ignore_value(qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, true));
-    if (priv->prDaemonRunning &&
-        !virDomainDefHasManagedPR(vm->def))
-        qemuProcessKillManagedPRDaemon(vm);
     goto cleanup;
 }

-- 
2.16.2