[PATCH 3/4] qemuMonitorBlockdevAdd: Take double pointer argument

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Modify qemuMonitorBlockdevAdd so that it takes a double pointer for the
@props argument so that it's cleared inside the call. This allows
writing cleaner callers.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_block.c        | 14 ++------------
 src/qemu/qemu_monitor.c      | 16 ++++++----------
 src/qemu/qemu_monitor.h      |  2 +-
 src/qemu/qemu_monitor_json.c |  5 +++--
 src/qemu/qemu_monitor_json.h |  2 +-
 5 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 63116ef5f2..fa6c6f98e3 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -1530,13 +1530,8 @@ static int
 qemuBlockStorageSourceAttachApplyStorage(qemuMonitorPtr mon,
                                          qemuBlockStorageSourceAttachDataPtr data)
 {
-    int rv;
-
     if (data->storageProps) {
-        rv = qemuMonitorBlockdevAdd(mon, data->storageProps);
-        data->storageProps = NULL;
-
-        if (rv < 0)
+        if (qemuMonitorBlockdevAdd(mon, &data->storageProps) < 0)
             return -1;

         data->storageAttached = true;
@@ -1563,13 +1558,8 @@ static int
 qemuBlockStorageSourceAttachApplyFormat(qemuMonitorPtr mon,
                                         qemuBlockStorageSourceAttachDataPtr data)
 {
-    int rv;
-
     if (data->formatProps) {
-        rv = qemuMonitorBlockdevAdd(mon, data->formatProps);
-        data->formatProps = NULL;
-
-        if (rv < 0)
+        if (qemuMonitorBlockdevAdd(mon, &data->formatProps) < 0)
             return -1;

         data->formatAttached = true;
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index ceedcd527a..463e24657a 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4390,23 +4390,19 @@ qemuMonitorBlockdevCreate(qemuMonitorPtr mon,
  * @mon: monitor object
  * @props: JSON object describing the blockdev to add
  *
- * Adds a new block device (BDS) to qemu. Note that @props is always consumed
- * by this function and should not be accessed after calling this function.
+ * Adds a new block device (BDS) to qemu. Note that *@props is consumed
+ * and set to NULL on success.
  */
 int
 qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
-                       virJSONValuePtr props)
+                       virJSONValuePtr *props)
 {
-    VIR_DEBUG("props=%p (node-name=%s)", props,
-              NULLSTR(virJSONValueObjectGetString(props, "node-name")));
+    VIR_DEBUG("props=%p (node-name=%s)", *props,
+              NULLSTR(virJSONValueObjectGetString(*props, "node-name")));

-    QEMU_CHECK_MONITOR_GOTO(mon, error);
+    QEMU_CHECK_MONITOR(mon);

     return qemuMonitorJSONBlockdevAdd(mon, props);
-
- error:
-    virJSONValueFree(props);
-    return -1;
 }


diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index cca2cdcb27..6a6b8efaee 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1323,7 +1323,7 @@ int qemuMonitorBlockdevCreate(qemuMonitorPtr mon,
                               virJSONValuePtr props);

 int qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
-                           virJSONValuePtr props);
+                           virJSONValuePtr *props);

 int qemuMonitorBlockdevDel(qemuMonitorPtr mon,
                            const char *nodename);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 95b5ab6968..815d17520a 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -8809,12 +8809,13 @@ qemuMonitorJSONBlockdevCreate(qemuMonitorPtr mon,

 int
 qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
-                           virJSONValuePtr props)
+                           virJSONValuePtr *props)
 {
     g_autoptr(virJSONValue) cmd = NULL;
     g_autoptr(virJSONValue) reply = NULL;
+    virJSONValuePtr pr = g_steal_pointer(props);

-    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-add", props)))
+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-add", pr)))
         return -1;

     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 61f5b0061d..fd2e09025e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -597,7 +597,7 @@ int qemuMonitorJSONBlockdevCreate(qemuMonitorPtr mon,
     ATTRIBUTE_NONNULL(1);

 int qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
-                               virJSONValuePtr props)
+                               virJSONValuePtr *props)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

 int qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
-- 
2.24.1