From: Chris Lalancette <clalance@redhat.com>
Date: Tue, 30 Mar 2010 13:03:26 +0000 (-0400)
Subject: Make virsh setmaxmem balloon only when successful.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=963a5b7a08729fab81d5f21a4fb223b725953dbe;p=libvirt.git

Make virsh setmaxmem balloon only when successful.

After playing around with virsh setmaxmem for a bit,
I ran into some surprising behavior; if a hypervisor does
not support the virDomainSetMaxMemory() API, but the value
specified for setmaxmem is less than the current amount
of memory in the domain, the domain would be ballooned
down *before* an error was reported.

To make this more consistent, run virDomainSetMaxMemory()
before trying to shrink; that way, if an error is thrown,
no changes to the running domain are made.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
---

diff --git a/tools/virsh.c b/tools/virsh.c
index b057847021..17c3074403 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -2596,19 +2596,19 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd)
         return FALSE;
     }
 
+    if (virDomainSetMaxMemory(dom, kilobytes) != 0) {
+        vshError(ctl, "%s", _("Unable to change MaxMemorySize"));
+        virDomainFree(dom);
+        return FALSE;
+    }
+
     if (kilobytes < info.memory) {
         if (virDomainSetMemory(dom, kilobytes) != 0) {
-            virDomainFree(dom);
             vshError(ctl, "%s", _("Unable to shrink current MemorySize"));
-            return FALSE;
+            ret = FALSE;
         }
     }
 
-    if (virDomainSetMaxMemory(dom, kilobytes) != 0) {
-        vshError(ctl, "%s", _("Unable to change MaxMemorySize"));
-        ret = FALSE;
-    }
-
     virDomainFree(dom);
     return ret;
 }