virsh: Fix logic wrt to --current flag in cmdSetmem

In my commit of v7.1.0-rc1~376 I've simplified the logic of
handling @flags. My assumption back then was that calling
virDomainSetMemory() is equivalent to
virDomainSetMemoryFlags(flags = 0). But that is not the case,
because it is equivalent to virDomainSetMemoryFlags(flags =
VIR_DOMAIN_AFFECT_LIVE). Fix the condition that calls the old
API.

Fixes: b5e267e8c59a257652f88d034cb1e0ce1ed4b58a
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1961118
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2021-05-18 14:24:01 +02:00
parent ae02689568
commit 168190e19c

View File

@ -9025,7 +9025,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd)
} }
kibibytes = VIR_DIV_UP(bytes, 1024); kibibytes = VIR_DIV_UP(bytes, 1024);
if (flags == 0) { if (!current && !live && !config) {
if (virDomainSetMemory(dom, kibibytes) != 0) if (virDomainSetMemory(dom, kibibytes) != 0)
ret = false; ret = false;
} else { } else {