External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-20 06:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMigrationDstPrepareStorage: Use 'switch' statement to include all storage types

Browse Source 
Decrease the likelyhood that addition of a new storage type will be
forgotten.

This patch also unifies the type check to consult the 'actual' type of
the storage in both cases as the NVMe check looked for the XML declared
type while virStorageSourceIsLocalStorage() looks for the
actual/translated type.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2024-02-08 16:48:25 +01:00
parent 064e77aa0a
commit e158b523b8
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_migration.c
View File

@ -465,11 +465,27 @@ qemuMigrationDstPrepareStorage(virDomainObj *vm,
if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks))
continue;
if (disk->src->type == VIR_STORAGE_TYPE_NVME) {
switch (virStorageSourceGetActualType(disk->src)) {
case VIR_STORAGE_TYPE_FILE:
case VIR_STORAGE_TYPE_BLOCK:
case VIR_STORAGE_TYPE_DIR:
diskSrcPath = virDomainDiskGetSource(disk);
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. */
virPCIDeviceAddressGetSysfsFile(&disk->src->nvme->pciAddr, &nvmePath);
diskSrcPath = nvmePath;
} else if (virStorageSourceIsLocalStorage(disk->src)) {
diskSrcPath = virDomainDiskGetSource(disk);
break;
case VIR_STORAGE_TYPE_NETWORK:
case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_VHOST_USER:
case VIR_STORAGE_TYPE_VHOST_VDPA:
case VIR_STORAGE_TYPE_LAST:
case VIR_STORAGE_TYPE_NONE:
break;
}
if (diskSrcPath) {