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>
This commit is contained in:
Michal Privoznik 2020-07-21 13:32:32 +02:00
parent 277412df51
commit f1ac53772d

View File

@ -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;
}