[Xen-changelog] [xen-unstable] [XEN] Fix booting with dom0_mem specifying 4GB or more.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 7f6ae888fb7ae174aed6b3d508e7990d3c8de2fd
# Parent  d13809a631b0d10e174c03911b583530387dd42b
[XEN] Fix booting with dom0_mem specifying 4GB or more.
Signed-off-by: Charles Coffing <ccoffing@xxxxxxxxxx>
---
 xen/arch/x86/domain_build.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r d13809a631b0 -r 7f6ae888fb7a xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       Thu Oct 12 14:25:51 2006 +0100
+++ b/xen/arch/x86/domain_build.c       Thu Oct 12 14:27:20 2006 +0100
@@ -401,11 +401,11 @@ int construct_dom0(struct domain *d,
            _p(dsi.v_start), _p(v_end));
     printk(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry));
 
-    if ( (v_end - dsi.v_start) > (nr_pages * PAGE_SIZE) )
+    if ( ((v_end - dsi.v_start)>>PAGE_SHIFT) > nr_pages )
     {
         printk("Initial guest OS requires too much space\n"
                "(%luMB is greater than %luMB limit)\n",
-               (v_end-dsi.v_start)>>20, (nr_pages<<PAGE_SHIFT)>>20);
+               (v_end-dsi.v_start)>>20, nr_pages>>(20-PAGE_SHIFT));
         return -ENOMEM;
     }
 

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