From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 23 Jun 2022 12:25:30 +0000 (+0200)
Subject: qemu_migration: Don't set unlimited memlock limit for RDMA
X-Git-Tag: v8.5.0-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f01fc4d1197c8f832638407e96502a23a0725990;p=thirdparty%2Flibvirt.git

qemu_migration: Don't set unlimited memlock limit for RDMA

Our documentation says RDMA migration requires hard_limit to be set so
that we know how big memory locking limit should be set for the domain
during migration. But since commit v1.2.13-71-gcf521fc8ba (which changed
the default hard_limit value from 0 to
VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) we were actually setting memlock
limit to unlimited if hard_limit was not set.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 04903a424f..e4e0417bde 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3180,7 +3180,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
     }
 
     if (STREQ_NULLABLE(protocol, "rdma") &&
-        vm->def->mem.hard_limit > 0 &&
+        virMemoryLimitIsSet(vm->def->mem.hard_limit) &&
         qemuDomainSetMaxMemLock(vm, vm->def->mem.hard_limit << 10,
                                 &priv->preMigrationMemlock) < 0) {
         goto error;