From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 11 May 2018 14:47:49 +0000 (+0200)
Subject: qemu: command: Move check whether PR manager object props need to be built
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b4f113ee44a0760deed9847eeb671458ea25e5c5;p=libvirt.git

qemu: command: Move check whether PR manager object props need to be built

Move it out of the format function and let the caller decide this.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 353e0af3d7..348ba3e99e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9737,9 +9737,6 @@ qemuBuildPRManagerInfoProps(const virDomainDiskDef *disk,
     *propsret = NULL;
     *aliasret = NULL;
 
-    if (!disk->src->pr)
-        return 0;
-
     if (virStoragePRDefIsManaged(disk->src->pr)) {
         if (VIR_STRDUP(alias, qemuDomainGetManagedPRAlias()) < 0)
             goto cleanup;
@@ -9775,6 +9772,9 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
     for (i = 0; i < def->ndisks; i++) {
         const virDomainDiskDef *disk = def->disks[i];
 
+        if (!disk->src->pr)
+            continue;
+
         if (virStoragePRDefIsManaged(disk->src->pr)) {
             if (managedAdded)
                 continue;
@@ -9785,9 +9785,6 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
         if (qemuBuildPRManagerInfoProps(disk, &props, &alias) < 0)
             goto cleanup;
 
-        if (!props)
-            continue;
-
         if (!(tmp = virQEMUBuildObjectCommandlineFromJSON("pr-manager-helper",
                                                           alias,
                                                           props)))
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5682695ae0..1a27b96830 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -395,6 +395,9 @@ qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm,
     *propsret = NULL;
     *aliasret = NULL;
 
+    if (!disk->src->pr)
+        return 0;
+
     if (virStoragePRDefIsManaged(disk->src->pr) &&
         priv->prDaemonRunning) {
         /* @disk requires qemu-pr-helper but there's already one running. */