Update to Xen 3.1.4. Chnages are bugfixes, mostly in various HVM parts.

8 files changed, 32 insertions, 134 deletions

diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index e1f584bfb06..259a6b2a15a 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/27 19:59:40 bouyer Exp $
 #
 
-VERSION=	3.1.3
-DISTNAME=	xen-${VERSION}-src
+VERSION=	3.1.4
+DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel3-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://xen.org/
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index f312b1e2985..5553b41b28d 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.9 2008/02/20 22:48:27 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2008/04/27 19:59:40 bouyer Exp $
 
-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 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
+RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
+Size (xen-3.1.4.tar.gz) = 6894493 bytes
 SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
-SHA1 (patch-ba) = c758b1f8a6017aa37a66ed372a4c94e9bf070ebd
+SHA1 (patch-ba) = cadfa6f2626e95c9ccb85ae7e3a8a7f318ea343f
 SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
 SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
 SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
 SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
-SHA1 (patch-cx) = 79a204f06d35d957e5af5858427abcc7729bae1e
diff --git a/sysutils/xenkernel3/patches/patch-ba b/sysutils/xenkernel3/patches/patch-ba
index db953b25a1a..d5db3fd6a14 100644
--- a/sysutils/xenkernel3/patches/patch-ba
+++ b/sysutils/xenkernel3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.4 2008/02/15 20:34:35 bouyer Exp $
+$NetBSD: patch-ba,v 1.5 2008/04/27 19:59:40 bouyer Exp $
 
---- 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 @@
+--- xen/arch/x86/domain_build.c.orig	2008-04-25 15:03:12.000000000 +0200
++++ xen/arch/x86/domain_build.c	2008-04-26 18:23:30.000000000 +0200
+@@ -308,6 +308,9 @@
             parms.pae       ? ", PAE"  : "",
             elf_msb(&elf)   ? "msb"    : "lsb",
             elf.pstart, elf.pend);
@@ -12,12 +12,3 @@ $NetBSD: patch-ba,v 1.4 2008/02/15 20:34:35 bouyer Exp $
  
      if ( !compatible )
      {
-@@ -349,6 +352,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
diff --git a/sysutils/xenkernel3/patches/patch-cx b/sysutils/xenkernel3/patches/patch-cx
deleted file mode 100644
index 3b0e8c69ef7..00000000000
--- a/sysutils/xenkernel3/patches/patch-cx
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-cx,v 1.2 2008/02/20 22:48:27 bouyer Exp $
-
-diff -r 64bb15c8521a -r f1574ad9f702 xen/arch/x86/mm.c
---- xen/arch/x86/mm.c	Mon Feb 18 14:24:54 2008 +0000
-+++ xen/arch/x86/mm.c.old	Mon Feb 18 14:26:38 2008 +0000
-@@ -1363,15 +1363,17 @@ static int mod_l1_entry(l1_pgentry_t *pl
-             return 0;
-         }
- 
--        adjust_guest_l1e(nl1e, d);
--
-         /* Fast path for identical mapping, r/w and presence. */
-         if ( !l1e_has_changed(ol1e, nl1e, _PAGE_RW | _PAGE_PRESENT) )
-+        {
-+            adjust_guest_l1e(nl1e, d);
-             return UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current);
-+        }
- 
-         if ( unlikely(!get_page_from_l1e(nl1e, FOREIGNDOM)) )
-             return 0;
--        
-+
-+        adjust_guest_l1e(nl1e, d);
-         if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current)) )
-         {
-             put_page_from_l1e(nl1e, d);
-@@ -1416,15 +1418,17 @@ static int mod_l2_entry(l2_pgentry_t *pl
-             return 0;
-         }
- 
--        adjust_guest_l2e(nl2e, d);
--
-         /* Fast path for identical mapping and presence. */
--        if ( !l2e_has_changed(ol2e, nl2e, _PAGE_PRESENT))
-+        if ( !l2e_has_changed(ol2e, nl2e, _PAGE_PRESENT) )
-+        {
-+            adjust_guest_l2e(nl2e, d);
-             return UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, current);
-+        }
- 
-         if ( unlikely(!get_page_from_l2e(nl2e, pfn, d)) )
-             return 0;
- 
-+        adjust_guest_l2e(nl2e, d);
-         if ( unlikely(!UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, current)) )
-         {
-             put_page_from_l2e(nl2e, pfn);
-@@ -1478,15 +1482,17 @@ static int mod_l3_entry(l3_pgentry_t *pl
-             return 0;
-         }
- 
--        adjust_guest_l3e(nl3e, d);
--
-         /* Fast path for identical mapping and presence. */
--        if (!l3e_has_changed(ol3e, nl3e, _PAGE_PRESENT))
-+        if ( !l3e_has_changed(ol3e, nl3e, _PAGE_PRESENT) )
-+        {
-+            adjust_guest_l3e(nl3e, d);
-             return UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current);
-+        }
- 
-         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);
-@@ -1537,15 +1543,17 @@ static int mod_l4_entry(struct domain *d
-             return 0;
-         }
- 
--        adjust_guest_l4e(nl4e, current->domain);
--
-         /* Fast path for identical mapping and presence. */
--        if (!l4e_has_changed(ol4e, nl4e, _PAGE_PRESENT))
-+        if ( !l4e_has_changed(ol4e, nl4e, _PAGE_PRESENT) )
-+        {
-+            adjust_guest_l4e(nl4e, current->domain);
-             return UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, current);
-+        }
- 
-         if ( unlikely(!get_page_from_l4e(nl4e, pfn, current->domain)) )
-             return 0;
- 
-+        adjust_guest_l4e(nl4e, current->domain);
-         if ( unlikely(!UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, current)) )
-         {
-             put_page_from_l4e(nl4e, pfn);
diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index 71be36f17f2..e1551dedb69 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/27 19:59:40 bouyer Exp $
 #
 
-VERSION=		3.1.3
-DISTNAME=		xen-${VERSION}-src
+VERSION=		3.1.4
+DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools3-hvm-${VERSION}
-PKGREVISION=		1
 CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
+EXTRACT_SUFX=		.tar.gz
 
 MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://xen.org/
diff --git a/sysutils/xentools3-hvm/distinfo b/sysutils/xentools3-hvm/distinfo
index 493560d4063..e5386cf508d 100644
--- a/sysutils/xentools3-hvm/distinfo
+++ b/sysutils/xentools3-hvm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2008/02/17 16:29:03 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2008/04/27 19:59:40 bouyer Exp $
 
-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 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
+RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
+Size (xen-3.1.4.tar.gz) = 6894493 bytes
 SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa
 SHA1 (patch-an) = cb6e3a7eac490851f2eacf557f05daf0d6966cce
 SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998
diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile
index d6b84891f91..fe283ff4502 100644
--- a/sysutils/xentools3/Makefile
+++ b/sysutils/xentools3/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/27 19:59:40 bouyer Exp $
 #
 
-VERSION=		3.1.3
-DISTNAME=		xen-${VERSION}-src
+VERSION=		3.1.4
+DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools3-${VERSION}
-PKGREVISION=		2
 CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
+EXTRACT_SUFX=		.tar.gz
 
 MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://xen.org/
diff --git a/sysutils/xentools3/distinfo b/sysutils/xentools3/distinfo
index 43e7991d9d7..82916ef20db 100644
--- a/sysutils/xentools3/distinfo
+++ b/sysutils/xentools3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2008/03/08 17:24:20 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2008/04/27 19:59:40 bouyer Exp $
 
-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 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
+RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
+Size (xen-3.1.4.tar.gz) = 6894493 bytes
 SHA1 (patch-aa) = dca8b8de73b9bdbb17f8245224575eb881cdf00d
 SHA1 (patch-ab) = dcafc8b6c4cd1e4dfc6f4ec806fd8076b3104b86
 SHA1 (patch-ac) = 4eb0f474d4e3a685788c1ce92c0b407dc3d7a855