[libvirt] [PATCH 20/21] qemu: migration: allow NBD tunneling migration

[Pavel Boldin]

Now that all the pieces are in their places finally allow NBD in
tunnelled migration.

Signed-off-by: Pavel Boldin <pboldin at mirantis.com>
---
 src/qemu/qemu_migration.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 27c1acb..9520e34 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3041,13 +3041,6 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver,
                         goto cleanup;
                     }
                 }
-
-                if (flags & VIR_MIGRATE_TUNNELLED) {
-                    virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                                   _("Selecting disks to migrate is not "
-                                     "implemented for tunnelled migration"));
-                    goto cleanup;
-                }
             } else {
                 virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                                _("qemu does not support drive-mirror command"));
@@ -3056,13 +3049,8 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver,
         }
 
         if (has_drive_mirror) {
-            /* TODO support NBD for TUNNELLED migration */
-            if (flags & VIR_MIGRATE_TUNNELLED) {
-                VIR_WARN("NBD in tunnelled migration is currently not supported");
-            } else {
-                cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
-                priv->nbdPort = 0;
-            }
+            cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
+            priv->nbdPort = 0;
         }
     }
 
-- 
1.9.1