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

qemuMigrationDstPrepareStorage: Rework storage existence check

Browse Source 
Check the existance of storage per-type rather than trying to come up
with a common "path".

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2024-02-19 13:47:55 +01:00
parent 1e12394d3b
commit d6ba6cbaa4
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/qemu/qemu_migration.c
View File

@ -434,8 +434,7 @@ qemuMigrationDstPrepareStorage(virDomainObj *vm,
for (i = 0; i < nbd->ndisks; i++) {
virDomainDiskDef *disk;
const char *diskSrcPath = NULL;
g_autofree char *nvmePath = NULL;
bool exists = false;
VIR_DEBUG("Looking up disk target '%s' (capacity=%llu)",
nbd->disks[i].target, nbd->disks[i].capacity);
@ -471,21 +470,27 @@ qemuMigrationDstPrepareStorage(virDomainObj *vm,
diskPriv->migrationslice = true;
}
}
G_GNUC_FALLTHROUGH;
exists = virFileExists(disk->src->path);
break;
case VIR_STORAGE_TYPE_FILE:
case VIR_STORAGE_TYPE_DIR:
diskSrcPath = virDomainDiskGetSource(disk);
exists = virFileExists(disk->src->path);
break;
case VIR_STORAGE_TYPE_NVME:
/* While NVMe disks are local, they are not accessible via src->path.
* Therefore, we have to return false here. */
case VIR_STORAGE_TYPE_NVME: {
/* While NVMe disks are local, they are not accessible via src->path */
g_autofree char *nvmePath = NULL;
virPCIDeviceAddressGetSysfsFile(&disk->src->nvme->pciAddr, &nvmePath);
diskSrcPath = nvmePath;
exists = virFileExists(nvmePath);
break;
}
case VIR_STORAGE_TYPE_VHOST_VDPA:
diskSrcPath = disk->src->vdpadev;
exists = virFileExists(disk->src->vdpadev);
break;
case VIR_STORAGE_TYPE_NETWORK:
@ -496,20 +501,17 @@ qemuMigrationDstPrepareStorage(virDomainObj *vm,
break;
}
if (diskSrcPath) {
/* don't pre-create existing disks */
if (virFileExists(diskSrcPath)) {
VIR_DEBUG("Skipping pre-create of existing source for disk '%s'", disk->dst);
continue;
}
}
VIR_DEBUG("target='%s' exists='%d'", disk->dst, exists);
if (exists)
continue;
/* create the storage - if supported */
if (incremental) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("pre-creation of storage target '%1$s' for incremental storage migration of disk '%2$s' is not supported"),
NULLSTR(diskSrcPath), nbd->disks[i].target);
_("pre-creation of storage target for incremental storage migration of disk '%1$s' is not supported"),
nbd->disks[i].target);
return -1;
}