[libvirt PATCH v2 2/4] qemu: Don't ignore virProcessGetMaxMemLock() errors

Andrea Bolognani abologna at redhat.com
Tue Mar 9 13:47:07 UTC 2021


Now that we've implemented a fallback for the function that
obtains the information from /proc, there is no reason we would
get a failure unless there's something seriously wrong with the
environment we're running in, in which case we're better off
reporting the issue to the user rather than pretending
everything is fine.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
Reviewed-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_domain.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 73e2473dce..1e9178764b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9246,11 +9246,10 @@ qemuDomainAdjustMaxMemLock(virDomainObjPtr vm,
     if (bytes) {
         /* If this is the first time adjusting the limit, save the current
          * value so that we can restore it once memory locking is no longer
-         * required. Failing to obtain the current limit is not a critical
-         * failure, it just means we'll be unable to lower it later */
+         * required */
         if (!vm->originalMemlock) {
             if (virProcessGetMaxMemLock(vm->pid, &(vm->originalMemlock)) < 0)
-                vm->originalMemlock = 0;
+                return -1;
         }
     } else {
         /* Once memory locking is no longer required, we can restore the
-- 
2.26.2




More information about the libvir-list mailing list