ia64/xen-unstable

changeset 15837:32f331858d75

Fix domain restore after memory auto-balloon changes.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Thu Sep 06 18:26:45 2007 +0100 (2007-09-06)
parents 9813c9c79055
children 4ffca478e2f7 9cc5858c145d
files tools/python/xen/xend/XendCheckpoint.py
line diff
     1.1 --- a/tools/python/xen/xend/XendCheckpoint.py	Thu Sep 06 18:10:04 2007 +0100
     1.2 +++ b/tools/python/xen/xend/XendCheckpoint.py	Thu Sep 06 18:26:45 2007 +0100
     1.3 @@ -194,15 +194,14 @@ def restore(xd, fd, dominfo = None, paus
     1.4          pae  = 0
     1.5  
     1.6      try:
     1.7 -        restore_image = image.create(dominfo, dominfo.info['image'],
     1.8 -                                     dominfo.info['device'])
     1.9 +        restore_image = image.create(dominfo, dominfo.info)
    1.10          memory = restore_image.getRequiredAvailableMemory(
    1.11 -            dominfo.info['memory'] * 1024)
    1.12 +            dominfo.info['memory_dynamic_max'] / 1024)
    1.13          maxmem = restore_image.getRequiredAvailableMemory(
    1.14 -            dominfo.info['maxmem'] * 1024)
    1.15 +            dominfo.info['memory_static_max'] / 1024)
    1.16          shadow = restore_image.getRequiredShadowMemory(
    1.17 -            dominfo.info['shadow_memory'] * 1024,
    1.18 -            dominfo.info['maxmem'] * 1024)
    1.19 +            dominfo.info['shadow_memory'] / 1024,
    1.20 +            dominfo.info['memory_static_max'] / 1024)
    1.21  
    1.22          log.debug("restore:shadow=0x%x, _static_max=0x%x, _static_min=0x%x, ",
    1.23                    dominfo.info['shadow_memory'],