[Xen-changelog] [xen-unstable] Fix the xm mem-max command. Closes bug #933.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Date 1174913433 -3600
# Node ID e5f13664cfee473920cf0ad14584c347540d01b9
# Parent  15c74855ba684a46d90fd67869bb9e9ff9af2c4b
Fix the xm mem-max command.  Closes bug #933.

Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendDomainInfo.py |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff -r 15c74855ba68 -r e5f13664cfee tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Mon Mar 26 13:46:07 2007 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Mon Mar 26 13:50:33 2007 +0100
@@ -593,13 +593,15 @@ class XendDomainInfo:
         """Set the maximum memory limit of this domain
         @param limit: In MiB.
         """
-        log.debug("Setting memory maximum of domain %s (%d) to %d MiB.",
-                  self.info['name_label'], self.domid, limit)
+        log.debug("Setting memory maximum of domain %s (%s) to %d MiB.",
+                  self.info['name_label'], str(self.domid), limit)
 
         if limit <= 0:
             raise XendError('Invalid memory size')
 
-        self.info['memory_static_max'] = limit
+        MiB = 1024 * 1024
+        self.info['memory_static_max'] = limit * MiB
+
         if self.domid >= 0:
             maxmem = int(limit) * 1024
             try:
@@ -607,7 +609,7 @@ class XendDomainInfo:
             except Exception, ex:
                 raise XendError(str(ex))
         else:
-            self.info['memory_dynamic_max'] = limit
+            self.info['memory_dynamic_max'] = limit * MiB
             xen.xend.XendDomain.instance().managed_config_save(self)
 
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog