[Xen-changelog] [xen-unstable] merge

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID a1f987e9640f3824b15158be1ba0d426503e282f
# Parent  7957dffb855f0072d87e669f7e7b48a04059c726
# Parent  08158fadf543d6eea4d9b3e677661e097a10222d
merge
---
 tools/ioemu/vnc.c              |    2 ++
 tools/python/xen/xend/image.py |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff -r 7957dffb855f -r a1f987e9640f tools/ioemu/vnc.c
--- a/tools/ioemu/vnc.c Wed Oct 25 11:50:54 2006 +0100
+++ b/tools/ioemu/vnc.c Wed Oct 25 11:51:23 2006 +0100
@@ -203,6 +203,8 @@ static void set_bits_in_row(VncState *vs
        mask = ~(0ULL);
 
     h += y;
+    if (h > vs->ds->height)
+        h = vs->ds->height;
     for (; y < h; y++)
        row[y] |= mask;
 }
diff -r 7957dffb855f -r a1f987e9640f tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Wed Oct 25 11:50:54 2006 +0100
+++ b/tools/python/xen/xend/image.py    Wed Oct 25 11:51:23 2006 +0100
@@ -500,9 +500,12 @@ class X86_HVM_ImageHandler(HVMImageHandl
         # overhead due to getRequiredInitialReservation.
         maxmem_kb = self.getRequiredInitialReservation(maxmem_kb)
 
-        # 1MB per vcpu plus 4Kib/Mib of RAM.  This is higher than 
-        # the minimum that Xen would allocate if no value were given.
-        return max(1024 * self.vm.getVCpuCount() + maxmem_kb / 256,
+        # 256 pages (1MB) per vcpu,
+        # plus 1 page per MiB of RAM for the P2M map,
+        # plus 1 page per MiB of RAM to shadow the resident processes.  
+        # This is higher than the minimum that Xen would allocate if no value 
+        # were given (but the Xen minimum is for safety, not performance).
+        return max(4 * (256 * self.vm.getVCpuCount() + 2 * (maxmem_kb / 1024)),
                    shadow_mem_kb)
 
 

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