Update xen3 packages to 3.1.3. Changes are mostly bugfixes and enhancement

in HVM support.

4 files changed, 35 insertions, 21 deletions

diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index 308b681274d..a6c1f048b98 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2007/12/05 22:06:26 bouyer Exp $
+# $NetBSD: Makefile,v 1.10 2008/02/15 20:34:35 bouyer Exp $
 #
 
-VERSION=	3.1.2
+VERSION=	3.1.3
 DISTNAME=	xen-${VERSION}-src
 PKGNAME=	xenkernel3-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
@@ -17,7 +16,7 @@ ONLY_FOR_PLATFORM=	Linux-2.[46]*-i386 NetBSD-*-i386 Linux-2.[46]*-x86_64 NetBSD-
 CONFLICTS=	xenkernel30-*
 
 
-WRKSRC=		${WRKDIR}/xen-${VERSION}-src
+WRKSRC=		${WRKDIR}/xen-${VERSION}
 
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 496be509718..477563e2bce 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.7 2007/12/05 22:06:26 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2008/02/15 20:34:35 bouyer Exp $
 
-SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e
-RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad
-Size (xen-3.1.2-src.tgz) = 6975860 bytes
+SHA1 (xen-3.1.3-src.tgz) = 87b370df928feda599bbc7076e7a4589f67355c8
+RMD160 (xen-3.1.3-src.tgz) = b26b71e0422db7aece60aa4dd9f9c8d34affd0c7
+Size (xen-3.1.3-src.tgz) = 6891760 bytes
 SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
-SHA1 (patch-ba) = fbc32d449d5f3410e478b92d6348f550609d1180
+SHA1 (patch-ba) = c758b1f8a6017aa37a66ed372a4c94e9bf070ebd
 SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
 SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
 SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
 SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
+SHA1 (patch-cx) = 58804179cd4f39ccba10e3f3d40a8a6d9cee30a6
diff --git a/sysutils/xenkernel3/patches/patch-ba b/sysutils/xenkernel3/patches/patch-ba
index fa98c478f64..db953b25a1a 100644
--- a/sysutils/xenkernel3/patches/patch-ba
+++ b/sysutils/xenkernel3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.3 2007/12/05 22:06:27 bouyer Exp $
+$NetBSD: patch-ba,v 1.4 2008/02/15 20:34:35 bouyer Exp $
 
---- xen/arch/x86/domain_build.c.orig	2007-11-15 00:35:27.000000000 +0100
-+++ xen/arch/x86/domain_build.c	2007-12-05 22:55:53.000000000 +0100
-@@ -316,6 +316,9 @@
+--- xen/arch/x86/domain_build.c.orig	2008-01-31 11:06:54.000000000 +0100
++++ xen/arch/x86/domain_build.c	2008-02-13 21:24:12.000000000 +0100
+@@ -312,6 +312,9 @@
             parms.pae       ? ", PAE"  : "",
             elf_msb(&elf)   ? "msb"    : "lsb",
             elf.pstart, elf.pend);
@@ -21,11 +21,3 @@ $NetBSD: patch-ba,v 1.3 2007/12/05 22:06:27 bouyer Exp $
      if ( UNSET_ADDR != parms.virt_hv_start_low && elf_32bit(&elf) )
      {
  #if CONFIG_PAGING_LEVELS < 4
-@@ -642,6 +647,7 @@
-         l4start = l4tab = page_to_virt(page);
-     }
-     copy_page(l4tab, idle_pg_table);
-+    l4tab[0] = l4e_empty(); /* zap trampoline mapping */
-     l4tab[l4_table_offset(LINEAR_PT_VIRT_START)] =
-         l4e_from_paddr(__pa(l4start), __PAGE_HYPERVISOR);
-     l4tab[l4_table_offset(PERDOMAIN_VIRT_START)] =
diff --git a/sysutils/xenkernel3/patches/patch-cx b/sysutils/xenkernel3/patches/patch-cx
new file mode 100644
index 00000000000..225451b43b4
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-cx
@@ -0,0 +1,22 @@
+$NetBSD: patch-cx,v 1.1 2008/02/15 20:34:35 bouyer Exp $
+
+--- xen/arch/x86/mm.c.orig	2008-02-15 20:42:07.000000000 +0100
++++ xen/arch/x86/mm.c	2008-02-15 20:43:18.000000000 +0100
+@@ -1478,8 +1478,6 @@
+             return 0;
+         }
+ 
+-        adjust_guest_l3e(nl3e, d);
+-
+         /* Fast path for identical mapping and presence. */
+         if (!l3e_has_changed(ol3e, nl3e, _PAGE_PRESENT))
+             return UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current);
+@@ -1487,6 +1485,8 @@
+         if ( unlikely(!get_page_from_l3e(nl3e, pfn, d)) )
+             return 0;
+ 
++        adjust_guest_l3e(nl3e, d);
++
+         if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current)) )
+         {
+             put_page_from_l3e(nl3e, pfn);