From 00bf6cc1697c388b0985946f599c069789b40808 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 31 May 2018 13:20:52 +0200
Subject: [PATCH] qemu: command: Pass in 'src' rather than 'disk' to
 qemuBuildPRManagerInfoProps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Everything is contained in the virStorageSourceStructure.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_command.c | 12 +++++-------
 src/qemu/qemu_command.h |  2 +-
 src/qemu/qemu_hotplug.c |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a0f6d3ee6a..3b3608a3d8 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9696,7 +9696,7 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
 
 /**
  * qemuBuildPRManagerInfoProps:
- * @disk: disk definition
+ * @src: storage source
  * @propsret: Returns JSON object containing properties of the pr-manager-helper object
  *
  * Build the JSON properties for the pr-manager object.
@@ -9705,14 +9705,12 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
  *         -1 on failure (with error message set).
  */
 int
-qemuBuildPRManagerInfoProps(const virDomainDiskDef *disk,
+qemuBuildPRManagerInfoProps(virStorageSourcePtr src,
                             virJSONValuePtr *propsret)
 {
     return qemuMonitorCreateObjectProps(propsret,
-                                        "pr-manager-helper",
-                                        disk->src->pr->mgralias,
-                                        "s:path", disk->src->pr->path,
-                                        NULL);
+                                        "pr-manager-helper", src->pr->mgralias,
+                                        "s:path", src->pr->path, NULL);
 }
 
 
@@ -9739,7 +9737,7 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
             managedAdded = true;
         }
 
-        if (qemuBuildPRManagerInfoProps(disk, &props) < 0)
+        if (qemuBuildPRManagerInfoProps(disk->src, &props) < 0)
             goto cleanup;
 
         if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index c8810586c7..fc87fa6a59 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -55,7 +55,7 @@ virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver,
                                    int **nicindexes);
 
 /* Generate the object properties for pr-manager */
-int qemuBuildPRManagerInfoProps(const virDomainDiskDef *disk,
+int qemuBuildPRManagerInfoProps(virStorageSourcePtr src,
                                 virJSONValuePtr *propsret);
 
 /* Generate the object properties for a secret */
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 6c1210ddbb..121f9a9431 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -400,7 +400,7 @@ qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm,
         return 0;
     }
 
-    return qemuBuildPRManagerInfoProps(disk, propsret);
+    return qemuBuildPRManagerInfoProps(disk->src, propsret);
 }
 
 
-- 
GitLab