qemu: command: Return props as return value in qemuBuildPRManagerInfoProps

Also since we don't do any conditional formatting, fix the comment for
the function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3b3608a3d86382b863ea10fd1e34f78f5ba8ae84..8b3acf2957ddf8044aae39424fc2d104f47f68db 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9697,20 +9697,20 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
 /**
  * qemuBuildPRManagerInfoProps:
  * @src: storage source
- * @propsret: Returns JSON object containing properties of the pr-manager-helper object
  *
  * Build the JSON properties for the pr-manager object.
- *
- * Returns: 0 on success (@propsret is NULL if no properties are needed),
- *         -1 on failure (with error message set).
  */
-int
-qemuBuildPRManagerInfoProps(virStorageSourcePtr src,
-                            virJSONValuePtr *propsret)
+virJSONValuePtr
+qemuBuildPRManagerInfoProps(virStorageSourcePtr src)
 {
-    return qemuMonitorCreateObjectProps(propsret,
-                                        "pr-manager-helper", src->pr->mgralias,
-                                        "s:path", src->pr->path, NULL);
+    virJSONValuePtr ret = NULL;
+
+    if (qemuMonitorCreateObjectProps(&ret,
+                                     "pr-manager-helper", src->pr->mgralias,
+                                     "s:path", src->pr->path, NULL) < 0)
+        return NULL;
+
+    return ret;
 }
 
 
@@ -9737,7 +9737,7 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
             managedAdded = true;
         }
 
-        if (qemuBuildPRManagerInfoProps(disk->src, &props) < 0)
+        if (!(props = qemuBuildPRManagerInfoProps(disk->src)))
             goto cleanup;
 
         if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index fc87fa6a596de37042cf0592e22f1a540438ac0a..5bf9461846acc3c586fbb4e8666dcc9375010605 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -55,8 +55,7 @@ virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver,
                                    int **nicindexes);
 
 /* Generate the object properties for pr-manager */
-int qemuBuildPRManagerInfoProps(virStorageSourcePtr src,
-                                virJSONValuePtr *propsret);
+virJSONValuePtr qemuBuildPRManagerInfoProps(virStorageSourcePtr src);
 
 /* Generate the object properties for a secret */
 int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 121f9a9431c6cee43a5259443ad9849b2321d915..bea8d6ac85e76675ece0e5fff9a923e269723061 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -400,7 +400,10 @@ qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm,
         return 0;
     }
 
-    return qemuBuildPRManagerInfoProps(disk->src, propsret);
+    if (!(*propsret = qemuBuildPRManagerInfoProps(disk->src)))
+        return -1;
+
+    return 0;
 }