[pkgsrc/trunk]: pkgsrc/sysutils/xenkernel3 Properly initialize physaddr_bitsi...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7500940aca4c
branches:  trunk
changeset: 535718:7500940aca4c
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Mon Nov 26 19:35:24 2007 +0000

description:
Properly initialize physaddr_bitsize for native 64bit dom0. Makes
NetBSD/xenamd64 boot on systems with more than 4Gb RAM.
Bump pkgrevision.

diffstat:

 sysutils/xenkernel3/Makefile         |   4 ++--
 sysutils/xenkernel3/distinfo         |   4 ++--
 sysutils/xenkernel3/patches/patch-ba |  15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 019ad3bcc74f -r 7500940aca4c sysutils/xenkernel3/Makefile
--- a/sysutils/xenkernel3/Makefile      Mon Nov 26 19:19:26 2007 +0000
+++ b/sysutils/xenkernel3/Makefile      Mon Nov 26 19:35:24 2007 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2007/11/22 21:49:54 bouyer Exp $
+# $NetBSD: Makefile,v 1.7 2007/11/26 19:35:24 bouyer Exp $
 #
 
 VERSION=       3.1.0
 DISTNAME=      xen-${VERSION}-src
 PKGNAME=       xenkernel3-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \
                http://bits.xensource.com/oss-xen/release/${VERSION}/src.tgz/
diff -r 019ad3bcc74f -r 7500940aca4c sysutils/xenkernel3/distinfo
--- a/sysutils/xenkernel3/distinfo      Mon Nov 26 19:19:26 2007 +0000
+++ b/sysutils/xenkernel3/distinfo      Mon Nov 26 19:35:24 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/11/22 21:49:55 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2007/11/26 19:35:24 bouyer Exp $
 
 SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
 RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = 3eb6179c90090d5b05f97a66b50cf78ce50e6f56
 SHA1 (patch-ad) = 0af2e62c4a1469d03b3999cf0864c62e28d95ed0
 SHA1 (patch-ae) = 3bba21641c64d572a845966e6600d686e6d86983
-SHA1 (patch-ba) = a90ffef881c3fadcf3c25e4c638ef33158ec9e87
+SHA1 (patch-ba) = f9a576b74a7039167aee57d9583ac99e9cbf70a1
 SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
 SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
 SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
diff -r 019ad3bcc74f -r 7500940aca4c sysutils/xenkernel3/patches/patch-ba
--- a/sysutils/xenkernel3/patches/patch-ba      Mon Nov 26 19:19:26 2007 +0000
+++ b/sysutils/xenkernel3/patches/patch-ba      Mon Nov 26 19:35:24 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.1 2007/08/17 17:26:04 bouyer Exp $
+$NetBSD: patch-ba,v 1.2 2007/11/26 19:35:25 bouyer Exp $
 
---- xen/arch/x86/domain_build.c.orig   2007-08-16 21:34:39.000000000 +0200
-+++ xen/arch/x86/domain_build.c        2007-08-16 21:43:18.000000000 +0200
+--- xen/arch/x86/domain_build.c.orig   2007-05-18 16:45:21.000000000 +0200
++++ xen/arch/x86/domain_build.c        2007-11-26 15:49:00.000000000 +0100
 @@ -312,6 +312,9 @@
             parms.pae       ? ", PAE"  : "",
             elf_msb(&elf)   ? "msb"    : "lsb",
@@ -12,3 +12,12 @@
  
      if ( !compatible )
      {
+@@ -345,6 +348,8 @@
+     if ( parms.pae == PAEKERN_extended_cr3 )
+             set_bit(VMASST_TYPE_pae_extended_cr3, &d->vm_assist);
+ 
++    d->arch.physaddr_bitsize = 64;
++
+     if ( UNSET_ADDR != parms.virt_hv_start_low && elf_32bit(&elf) )
+     {
+ #if CONFIG_PAGING_LEVELS < 4