ia64/xen-unstable

changeset 8157:57acbaf6dd29

Merged.
author emellor@leeni.uk.xensource.com
date Thu Dec 01 03:21:45 2005 +0000 (2005-12-01)
parents 572752a4ed8b 9ff0a75fc3f7
children 5358eceec5ea
files
line diff
     1.1 --- a/tools/python/xen/xm/create.py	Thu Dec 01 03:09:35 2005 +0000
     1.2 +++ b/tools/python/xen/xm/create.py	Thu Dec 01 03:21:45 2005 +0000
     1.3 @@ -821,7 +821,7 @@ def balloon_out(dom0_min_mem, opts):
     1.4      ret = 1
     1.5  
     1.6      xc = xen.lowlevel.xc.xc()
     1.7 -    free_mem = xc.physinfo()['free_pages'] / 256
     1.8 +    free_mem = xc.physinfo()['free_memory']
     1.9      domU_need_mem = opts.vals.memory + SLACK 
    1.10  
    1.11      # we already have enough free memory, return success
    1.12 @@ -839,7 +839,7 @@ def balloon_out(dom0_min_mem, opts):
    1.13      while timeout > 0:
    1.14          time.sleep(0.1) # sleep 100ms
    1.15  
    1.16 -        free_mem = xc.physinfo()['free_pages'] / 256
    1.17 +        free_mem = xc.physinfo()['free_memory']
    1.18          if free_mem >= domU_need_mem:
    1.19              ret = 0
    1.20              break