NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Return props as return value in qemuBuildPRManagerInfoProps

Browse Source 
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>
This commit is contained in:
Peter Krempa 2018-05-31 13:29:45 +02:00
parent 00bf6cc169
commit b3286a51de
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_command.c
View File

@ -9697,20 +9697,20 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
/** /**
* qemuBuildPRManagerInfoProps: * qemuBuildPRManagerInfoProps:
* @src: storage source * @src: storage source
* @propsret: Returns JSON object containing properties of the pr-manager-helper object
* *
* Build the JSON properties for the pr-manager 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 virJSONValuePtr
qemuBuildPRManagerInfoProps(virStorageSourcePtr src, qemuBuildPRManagerInfoProps(virStorageSourcePtr src)
virJSONValuePtr *propsret)
{ {
return qemuMonitorCreateObjectProps(propsret, virJSONValuePtr ret = NULL;
"pr-manager-helper", src->pr->mgralias,
"s:path", src->pr->path, 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; managedAdded = true;
} }
if (qemuBuildPRManagerInfoProps(disk->src, &props) < 0) if (!(props = qemuBuildPRManagerInfoProps(disk->src)))
goto cleanup; goto cleanup;
if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)

3
src/qemu/qemu_command.h
View File

@ -55,8 +55,7 @@ virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver,
int **nicindexes); int **nicindexes);
/* Generate the object properties for pr-manager */ /* Generate the object properties for pr-manager */
int qemuBuildPRManagerInfoProps(virStorageSourcePtr src, virJSONValuePtr qemuBuildPRManagerInfoProps(virStorageSourcePtr src);
virJSONValuePtr *propsret);
/* Generate the object properties for a secret */ /* Generate the object properties for a secret */
int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo, int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,

5
src/qemu/qemu_hotplug.c
View File

@ -400,7 +400,10 @@ qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm,
return 0; return 0;
} }
return qemuBuildPRManagerInfoProps(disk->src, propsret); if (!(*propsret = qemuBuildPRManagerInfoProps(disk->src)))
return -1;
return 0;
} }