From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 20 Nov 2014 12:44:18 +0000 (+0100)
Subject: qemu: Really fix crash in tunnelled migration
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=800454e45ec9ad1ee495bfa7ffe617453f349d3e;p=libvirt.git

qemu: Really fix crash in tunnelled migration

Oops, I forgot to squash one more instance of the same check in the
previous commit (v1.2.10-144-g52691f9).

https://bugzilla.redhat.com/show_bug.cgi?id=1147331
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 89313dff1a..a1b145826e 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2757,7 +2757,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
                                     QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
         goto stop;
 
-    if (STREQ(protocol, "rdma") &&
+    if (STREQ_NULLABLE(protocol, "rdma") &&
         virProcessSetMaxMemLock(vm->pid, vm->def->mem.hard_limit << 10) < 0) {
         goto stop;
     }