From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 18 May 2021 12:24:01 +0000 (+0200)
Subject: virsh: Fix logic wrt to --current flag in cmdSetmem
X-Git-Tag: v7.4.0-rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=168190e19c3a67182b38ed58ad044ceef990ed1d;p=thirdparty%2Flibvirt.git

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>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 0825f82522..9316aae3fd 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -9025,7 +9025,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd)
     }
     kibibytes = VIR_DIV_UP(bytes, 1024);
 
-    if (flags == 0) {
+    if (!current && !live && !config) {
         if (virDomainSetMemory(dom, kibibytes) != 0)
             ret = false;
     } else {