External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 22:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Pass in 'src' rather than 'disk' to qemuBuildPRManagerInfoProps

Browse Source 
Everything is contained in the virStorageSourceStructure.

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:20:52 +02:00
parent 8ac8301366
commit 00bf6cc169
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_command.c
View File

@ -9696,7 +9696,7 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
/** /**
* qemuBuildPRManagerInfoProps: * qemuBuildPRManagerInfoProps:
* @disk: disk definition * @src: storage source
* @propsret: Returns JSON object containing properties of the pr-manager-helper object * @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.
@ -9705,14 +9705,12 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
* -1 on failure (with error message set). * -1 on failure (with error message set).
*/ */
int int
qemuBuildPRManagerInfoProps(const virDomainDiskDef *disk, qemuBuildPRManagerInfoProps(virStorageSourcePtr src,
virJSONValuePtr *propsret) virJSONValuePtr *propsret)
{ {
return qemuMonitorCreateObjectProps(propsret, return qemuMonitorCreateObjectProps(propsret,
"pr-manager-helper", "pr-manager-helper", src->pr->mgralias,
disk->src->pr->mgralias, "s:path", src->pr->path, NULL);
"s:path", disk->src->pr->path,
NULL);
} }
@ -9739,7 +9737,7 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
managedAdded = true; managedAdded = true;
} }
if (qemuBuildPRManagerInfoProps(disk, &props) < 0) if (qemuBuildPRManagerInfoProps(disk->src, &props) < 0)
goto cleanup; goto cleanup;
if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)

2
src/qemu/qemu_command.h
View File

@ -55,7 +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(const virDomainDiskDef *disk, int qemuBuildPRManagerInfoProps(virStorageSourcePtr src,
virJSONValuePtr *propsret); virJSONValuePtr *propsret);
/* Generate the object properties for a secret */ /* Generate the object properties for a secret */

2
src/qemu/qemu_hotplug.c
View File

@ -400,7 +400,7 @@ qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm,
return 0; return 0;
} }
return qemuBuildPRManagerInfoProps(disk, propsret); return qemuBuildPRManagerInfoProps(disk->src, propsret);
} }