From a883fb9c750998d56ce9232cba34dc48ccd3d43d Mon Sep 17 00:00:00 2001 From: Michael Chapman Date: Fri, 13 Mar 2015 11:34:58 +1100 Subject: [PATCH] qemu: skip precreation of network disks Commit cf54c60699833b3791a5d0eb3eb5a1948c267f6b introduced the ability to create missing storage volumes during migration. For network disks, however, we may not necessarily be able to detect whether they already exist -- there is no straight-forward way to map the disk to a storage volume, and even if there were it's possible no configured storage pool actually contains the disk. It is better to assume the network disk exists in this case, rather than aborting the migration completely. If the volume really is missing, QEMU will generate an appropriate error later in the migration. Signed-off-by: Michael Chapman (cherry picked from commit a1b1805155ede31dde755ff087963aa10b9b069b) --- src/qemu/qemu_migration.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 20e40aa37a..9458606827 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1507,9 +1507,13 @@ qemuMigrationPrecreateDisk(virConnectPtr conn, flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; break; + case VIR_STORAGE_TYPE_NETWORK: + VIR_DEBUG("Skipping creation of network disk '%s'", + disk->dst); + return 0; + case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_DIR: - case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR,