aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-09-06 18:26:45 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-09-06 18:26:45 +0100
commitf0a09ab129e5f0a4e6de6610f77eea9005fa5eb2 (patch)
tree8abbb231bc7ab842dcf0c093dea2cbff3fe09e88 /tools
parent632521636982c5c326c8df45edbe6bb8a51f391b (diff)
downloadxen-f0a09ab129e5f0a4e6de6610f77eea9005fa5eb2.tar.gz
xen-f0a09ab129e5f0a4e6de6610f77eea9005fa5eb2.tar.bz2
xen-f0a09ab129e5f0a4e6de6610f77eea9005fa5eb2.zip
Fix domain restore after memory auto-balloon changes.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/python/xen/xend/XendCheckpoint.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py
index e616c45efc..ac53e945b1 100644
--- a/tools/python/xen/xend/XendCheckpoint.py
+++ b/tools/python/xen/xend/XendCheckpoint.py
@@ -194,15 +194,14 @@ def restore(xd, fd, dominfo = None, paused = False):
pae = 0
try:
- restore_image = image.create(dominfo, dominfo.info['image'],
- dominfo.info['device'])
+ restore_image = image.create(dominfo, dominfo.info)
memory = restore_image.getRequiredAvailableMemory(
- dominfo.info['memory'] * 1024)
+ dominfo.info['memory_dynamic_max'] / 1024)
maxmem = restore_image.getRequiredAvailableMemory(
- dominfo.info['maxmem'] * 1024)
+ dominfo.info['memory_static_max'] / 1024)
shadow = restore_image.getRequiredShadowMemory(
- dominfo.info['shadow_memory'] * 1024,
- dominfo.info['maxmem'] * 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, ",
dominfo.info['shadow_memory'],