]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: skip precreation of network disks
authorMichael Chapman <mike@very.puzzling.org>
Fri, 13 Mar 2015 00:34:58 +0000 (11:34 +1100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 23 Mar 2015 09:25:20 +0000 (10:25 +0100)
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 <mike@very.puzzling.org>
src/qemu/qemu_migration.c

index 5b8160f96191954b437b14f432c6883fcafb9dbb..f54208756789dad1fa991379e4cf2132df4ba146 100644 (file)
@@ -1508,9 +1508,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,