[Xen-changelog] [xen-unstable] Xend: "shadow_memory" setting in xm config is in MiB, not bytes.

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

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1189510239 -3600
# Node ID 7dfc9a7a0d4e595660a671ace64523c876158ad0
# Parent  5ccf8bbf8628675433b09585b5bc464f5a0981d5
Xend: "shadow_memory" setting in xm config is in MiB, not bytes.
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
---
 tools/examples/xmexample.hvm            |    1 +
 tools/python/xen/xend/XendCheckpoint.py |    2 +-
 tools/python/xen/xend/XendDomainInfo.py |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff -r 5ccf8bbf8628 -r 7dfc9a7a0d4e tools/examples/xmexample.hvm
--- a/tools/examples/xmexample.hvm      Tue Sep 11 12:14:38 2007 +0100
+++ b/tools/examples/xmexample.hvm      Tue Sep 11 12:30:39 2007 +0100
@@ -28,6 +28,7 @@ memory = 128
 memory = 128
 
 # Shadow pagetable memory for the domain, in MB.
+# If not explicictly set, xend will pick an appropriate value.  
 # Should be at least 2KB per MB of domain memory, plus a few MB per vcpu.
 # shadow_memory = 8
 
diff -r 5ccf8bbf8628 -r 7dfc9a7a0d4e tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Tue Sep 11 12:14:38 2007 +0100
+++ b/tools/python/xen/xend/XendCheckpoint.py   Tue Sep 11 12:30:39 2007 +0100
@@ -200,7 +200,7 @@ def restore(xd, fd, dominfo = None, paus
         maxmem = restore_image.getRequiredAvailableMemory(
             dominfo.info['memory_static_max'] / 1024)
         shadow = restore_image.getRequiredShadowMemory(
-            dominfo.info['shadow_memory'] / 1024,
+            dominfo.info['shadow_memory'] * 1024,
             dominfo.info['memory_static_max'] / 1024)
 
         log.debug("restore:shadow=0x%x, _static_max=0x%x, _static_min=0x%x, ",
diff -r 5ccf8bbf8628 -r 7dfc9a7a0d4e tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 11 12:14:38 2007 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 11 12:30:39 2007 +0100
@@ -1610,7 +1610,7 @@ class XendDomainInfo:
             maxmem = self.image.getRequiredAvailableMemory(
                 self.info['memory_static_max'] / 1024)
             shadow = self.image.getRequiredShadowMemory(
-                self.info['shadow_memory'] / 1024,
+                self.info['shadow_memory'] * 1024,
                 self.info['memory_static_max'] / 1024)
 
             log.debug("_initDomain:shadow_memory=0x%x, memory_static_max=0x%x, 
memory_static_min=0x%x.", self.info['shadow_memory'], 
self.info['memory_static_max'], self.info['memory_static_min'],)

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