From: Andrea Bolognani Date: Wed, 3 Mar 2021 11:02:49 +0000 (+0100) Subject: qemu: Don't ignore virProcessGetMaxMemLock() errors X-Git-Tag: v7.2.0-rc1~55 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6b280451384f0816b1835befaf0e9f9b9946c31;p=thirdparty%2Flibvirt.git qemu: Don't ignore virProcessGetMaxMemLock() errors 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 Reviewed-by: Michal Privoznik --- diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5c98f8ff1a..e8477d1f05 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9350,11 +9350,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