ia64/xen-unstable

changeset 11970:a1f987e9640f

merge
author kfraser@localhost.localdomain
date Wed Oct 25 11:51:23 2006 +0100 (2006-10-25)
parents 7957dffb855f 08158fadf543
children f312c2d01d8b
files
line diff
     1.1 --- a/tools/ioemu/vnc.c	Wed Oct 25 11:50:54 2006 +0100
     1.2 +++ b/tools/ioemu/vnc.c	Wed Oct 25 11:51:23 2006 +0100
     1.3 @@ -203,6 +203,8 @@ static void set_bits_in_row(VncState *vs
     1.4  	mask = ~(0ULL);
     1.5  
     1.6      h += y;
     1.7 +    if (h > vs->ds->height)
     1.8 +        h = vs->ds->height;
     1.9      for (; y < h; y++)
    1.10  	row[y] |= mask;
    1.11  }
     2.1 --- a/tools/python/xen/xend/image.py	Wed Oct 25 11:50:54 2006 +0100
     2.2 +++ b/tools/python/xen/xend/image.py	Wed Oct 25 11:51:23 2006 +0100
     2.3 @@ -500,9 +500,12 @@ class X86_HVM_ImageHandler(HVMImageHandl
     2.4          # overhead due to getRequiredInitialReservation.
     2.5          maxmem_kb = self.getRequiredInitialReservation(maxmem_kb)
     2.6  
     2.7 -        # 1MB per vcpu plus 4Kib/Mib of RAM.  This is higher than 
     2.8 -        # the minimum that Xen would allocate if no value were given.
     2.9 -        return max(1024 * self.vm.getVCpuCount() + maxmem_kb / 256,
    2.10 +        # 256 pages (1MB) per vcpu,
    2.11 +        # plus 1 page per MiB of RAM for the P2M map,
    2.12 +        # plus 1 page per MiB of RAM to shadow the resident processes.  
    2.13 +        # This is higher than the minimum that Xen would allocate if no value 
    2.14 +        # were given (but the Xen minimum is for safety, not performance).
    2.15 +        return max(4 * (256 * self.vm.getVCpuCount() + 2 * (maxmem_kb / 1024)),
    2.16                     shadow_mem_kb)
    2.17  
    2.18