[libvirt] [PATCH 3/4] 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(a)redhat.com>
---
src/qemu/qemu_command.c | 22 +++++++++++-----------
src/qemu/qemu_command.h | 3 +--
src/qemu/qemu_hotplug.c | 5 ++++-
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 9256104f27..2d559938ed 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9692,20 +9692,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;
}
@@ -9732,7 +9732,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 60b4dcf054..10aa21bcdd 100644
--- 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 44bd41ccb6..e78aff7adf 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -401,7 +401,10 @@ qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm,
return 0;
}
- return qemuBuildPRManagerInfoProps(disk->src, propsret);
+ if (!(*propsret = qemuBuildPRManagerInfoProps(disk->src)))
+ return -1;
+
+ return 0;
}
--
2.16.2