|
 |
43fe83 |
From ffcc2cde1df1883b541ecb03b14e4edecd36d2ca Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <ffcc2cde1df1883b541ecb03b14e4edecd36d2ca.1383922565.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
43fe83 |
Date: Thu, 7 Nov 2013 14:49:06 +0100
|
|
|
43fe83 |
Subject: [PATCH] qemuMigrationBeginPhase: Check for 'drive-mirror' for NBD
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1022393
|
|
|
43fe83 |
|
|
|
43fe83 |
So far we are checking if qemu supports 'nbd-server-start'. This,
|
|
|
43fe83 |
however, makes no sense on the source as nbd-server-* is used on the
|
|
|
43fe83 |
destination. On the source the 'drive-mirror' is used instead.
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
43fe83 |
(cherry picked from commit b2f31af701cbd0da74b173d2625c5c53604eb999)
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/qemu/qemu_migration.c | 2 +-
|
|
|
43fe83 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
43fe83 |
index 379e381..fb5568e 100644
|
|
|
43fe83 |
--- a/src/qemu/qemu_migration.c
|
|
|
43fe83 |
+++ b/src/qemu/qemu_migration.c
|
|
|
43fe83 |
@@ -1990,7 +1990,7 @@ static char
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
|
|
|
43fe83 |
if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) &&
|
|
|
43fe83 |
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) {
|
|
|
43fe83 |
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR)) {
|
|
|
43fe83 |
/* TODO support NBD for TUNNELLED migration */
|
|
|
43fe83 |
if (flags & VIR_MIGRATE_TUNNELLED) {
|
|
|
43fe83 |
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4.2
|
|
|
43fe83 |
|