[Xen-changelog] Merged.

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

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 57acbaf6dd29c154f8ee20928eaa1c630a27a913
# Parent  572752a4ed8bb0928a32fc673d498792ede0b65c
# Parent  9ff0a75fc3f703663f49df93d385624b819862b4
Merged.

diff -r 572752a4ed8b -r 57acbaf6dd29 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Thu Dec  1 03:09:35 2005
+++ b/tools/python/xen/xm/create.py     Thu Dec  1 03:21:45 2005
@@ -821,7 +821,7 @@
     ret = 1
 
     xc = xen.lowlevel.xc.xc()
-    free_mem = xc.physinfo()['free_pages'] / 256
+    free_mem = xc.physinfo()['free_memory']
     domU_need_mem = opts.vals.memory + SLACK 
 
     # we already have enough free memory, return success
@@ -839,7 +839,7 @@
     while timeout > 0:
         time.sleep(0.1) # sleep 100ms
 
-        free_mem = xc.physinfo()['free_pages'] / 256
+        free_mem = xc.physinfo()['free_memory']
         if free_mem >= domU_need_mem:
             ret = 0
             break

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