diff options
| author | Tim Deegan <Tim.Deegan@xensource.com> | 2007-09-11 12:30:39 +0100 |
|---|---|---|
| committer | Tim Deegan <Tim.Deegan@xensource.com> | 2007-09-11 12:30:39 +0100 |
| commit | e58cf9dbf9637ec11acf7de9c2fd39c776c2b394 (patch) | |
| tree | c080ca8efe5acf70519872a400db7ffab475372f | |
| parent | 9caf62ac1390ad6fc8895ae442023dedd2c3597b (diff) | |
| download | xen-e58cf9dbf9637ec11acf7de9c2fd39c776c2b394.tar.gz xen-e58cf9dbf9637ec11acf7de9c2fd39c776c2b394.tar.bz2 xen-e58cf9dbf9637ec11acf7de9c2fd39c776c2b394.zip | |
Xend: "shadow_memory" setting in xm config is in MiB, not bytes.
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
| -rw-r--r-- | tools/examples/xmexample.hvm | 1 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendCheckpoint.py | 2 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm index c027f0821b..e040548186 100644 --- a/tools/examples/xmexample.hvm +++ b/tools/examples/xmexample.hvm @@ -28,6 +28,7 @@ builder='hvm' 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 --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index ac53e945b1..a79c2b4ce2 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -200,7 +200,7 @@ def restore(xd, fd, dominfo = None, paused = False): 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 --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 20009b0760..65e38f82d5 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -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'],) |