From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 21 Jul 2020 11:32:32 +0000 (+0200)
Subject: qemuDomainSetupDisk: Accept @src
X-Git-Tag: v6.7.0-rc1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ac53772d28f4dc485b129294176e540c56eac9;p=thirdparty%2Flibvirt.git

qemuDomainSetupDisk: Accept @src

The aim to make it look as close to
qemuDomainNamespaceSetupDisk() as possible. The latter will call
the former and this change makes that diff easier to read.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
index 364f3fdb50..a57c8d219d 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -486,13 +486,13 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg,
 
 
 static int
-qemuDomainSetupDisk(virDomainDiskDefPtr disk,
+qemuDomainSetupDisk(virStorageSourcePtr src,
                     const struct qemuDomainCreateDeviceData *data)
 {
     virStorageSourcePtr next;
     bool hasNVMe = false;
 
-    for (next = disk->src; virStorageSourceIsBacking(next); next = next->backingStore) {
+    for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) {
         VIR_AUTOSTRINGLIST targetPaths = NULL;
         size_t i;
 
@@ -531,7 +531,7 @@ qemuDomainSetupDisk(virDomainDiskDefPtr disk,
     }
 
     /* qemu-pr-helper might require access to /dev/mapper/control. */
-    if (disk->src->pr &&
+    if (src->pr &&
         qemuDomainCreateDevice(QEMU_DEVICE_MAPPER_CONTROL_PATH, data, true) < 0)
         return -1;
 
@@ -551,7 +551,7 @@ qemuDomainSetupAllDisks(virDomainObjPtr vm,
     VIR_DEBUG("Setting up disks");
 
     for (i = 0; i < vm->def->ndisks; i++) {
-        if (qemuDomainSetupDisk(vm->def->disks[i],
+        if (qemuDomainSetupDisk(vm->def->disks[i]->src,
                                 data) < 0)
             return -1;
     }