|
 |
9119d9 |
From df89cb75c6663d7b6245cc92a9f31bb1eae6bb66 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <df89cb75c6663d7b6245cc92a9f31bb1eae6bb66@dist-git>
|
|
|
9119d9 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
Date: Thu, 20 Nov 2014 13:44:18 +0100
|
|
|
9119d9 |
Subject: [PATCH] qemu: Really fix crash in tunnelled migration
|
|
|
9119d9 |
|
|
|
9119d9 |
Oops, I forgot to squash one more instance of the same check in the
|
|
|
9119d9 |
previous commit (v1.2.10-144-g52691f9).
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1147331
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit 800454e45ec9ad1ee495bfa7ffe617453f349d3e)
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/qemu/qemu_migration.c | 2 +-
|
|
|
9119d9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
9119d9 |
index 4b701d3..225aafd 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_migration.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_migration.c
|
|
|
9119d9 |
@@ -2765,7 +2765,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
|
|
|
9119d9 |
QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
|
|
|
9119d9 |
goto stop;
|
|
|
9119d9 |
|
|
|
9119d9 |
- if (STREQ(protocol, "rdma") &&
|
|
|
9119d9 |
+ if (STREQ_NULLABLE(protocol, "rdma") &&
|
|
|
9119d9 |
virProcessSetMaxMemLock(vm->pid, vm->def->mem.hard_limit << 10) < 0) {
|
|
|
9119d9 |
goto stop;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.3
|
|
|
9119d9 |
|