External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMigrationSrcIsSafe: Rework slightly

Browse Source 
There are going to be more disk types that are considered unsafe
with respect to migration. Therefore, move the error reporting
call outside of if() body and rework if-else combo to switch().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Michal Privoznik 2019-08-01 10:12:49 +02:00
parent 4fac30d988
commit 1ee471960b
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_migration.c
View File

@ -1257,6 +1257,8 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def,
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {
virDomainDiskDefPtr disk = def->disks[i]; virDomainDiskDefPtr disk = def->disks[i];
const char *src = virDomainDiskGetSource(disk); const char *src = virDomainDiskGetSource(disk);
int actualType = virStorageSourceGetActualType(disk->src);
bool unsafe = false;
/* Disks without any source (i.e. floppies and CD-ROMs) /* Disks without any source (i.e. floppies and CD-ROMs)
* OR readonly are safe. */ * OR readonly are safe. */
@ -1270,21 +1272,34 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def,
continue; continue;
/* However, disks on local FS (e.g. ext4) are not safe. */ /* However, disks on local FS (e.g. ext4) are not safe. */
if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_FILE) { switch ((virStorageType) actualType) {
case VIR_STORAGE_TYPE_FILE:
if ((rc = virFileIsSharedFS(src)) < 0) { if ((rc = virFileIsSharedFS(src)) < 0) {
return false; return false;
} else if (rc == 0) { } else if (rc == 0) {
virReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", unsafe = true;
_("Migration without shared storage is unsafe"));
return false;
} }
if ((rc = virStorageFileIsClusterFS(src)) < 0) if ((rc = virStorageFileIsClusterFS(src)) < 0)
return false; return false;
else if (rc == 1) else if (rc == 1)
continue; continue;
} else if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK) { break;
case VIR_STORAGE_TYPE_NETWORK:
/* But network disks are safe again. */ /* But network disks are safe again. */
continue; continue;
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_BLOCK:
case VIR_STORAGE_TYPE_DIR:
case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_LAST:
break;
}
if (unsafe) {
virReportError(VIR_ERR_MIGRATE_UNSAFE, "%s",
_("Migration without shared storage is unsafe"));
return false;
} }
/* Our code elsewhere guarantees shared disks are either readonly (in /* Our code elsewhere guarantees shared disks are either readonly (in