From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 7 Nov 2013 13:08:36 +0000 (+0100)
Subject: qemuMigrationBeginPhase: Check for 'drive-mirror' for NBD
X-Git-Tag: v1.2.0-rc1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2f31af701cbd0da74b173d2625c5c53604eb999;p=thirdparty%2Flibvirt.git

qemuMigrationBeginPhase: Check for 'drive-mirror' for NBD

So far we are checking if qemu supports 'nbd-server-start'. This,
however, makes no sense on the source as nbd-server-* is used on the
destination. On the source the 'drive-mirror' is used instead.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 7d8b7274c7..166fbb9e5c 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1987,7 +1987,7 @@ static char
         goto cleanup;
 
     if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) &&
-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) {
+        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR)) {
         /* TODO support NBD for TUNNELLED migration */
         if (flags & VIR_MIGRATE_TUNNELLED) {
             VIR_WARN("NBD in tunnelled migration is currently not supported");