Update the Xen3 packages to 3.1.2.

Package changes:
  point HOMEPAGE to http://xen.org/
  looks like the Xen peoples won't put a tarball on their http server
  for this; I built one from their repository and put it in
  ${MASTER_SITE_LOCAL}
Summary of changes since 3.1.0:
  some of our patches have been integrated upstream, thanks to Christoph Egger
  various performances improvements and bug fixes, including some security
    fixes, and one bug that would lead to floating point register
    leak/corruption from HVM to PV guests on Intel VMX CPUs.

8 files changed, 27 insertions, 95 deletions

diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index 94253f9c5b1..3a862dca8f9 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2007/11/26 19:35:24 bouyer Exp $
+# $NetBSD: Makefile,v 1.8 2007/12/03 21:54:28 bouyer Exp $
 #
 
-VERSION=	3.1.0
+VERSION=	3.1.2
 DISTNAME=	xen-${VERSION}-src
 PKGNAME=	xenkernel3-${VERSION}
-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/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bouyer@NetBSD.org
-HOMEPAGE=	http://www.cl.cam.ac.uk/research/srg/netos/xen/
+HOMEPAGE=	http://xen.org/
 COMMENT=	Xen3 Kernel
 
 ONLY_FOR_PLATFORM=	Linux-2.[46]*-i386 NetBSD-*-i386 Linux-2.[46]*-x86_64 NetBSD-*-x86_64
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 8f77f2b24dc..77ea4142300 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.5 2007/11/26 19:35:24 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2007/12/03 21:54:29 bouyer Exp $
 
-SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
-RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
-Size (xen-3.1.0-src.tgz) = 6831094 bytes
+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 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
-SHA1 (patch-ab) = 58ba3a1ec8c1bbc895dd70d286eb5a70778b7c7f
-SHA1 (patch-ac) = 3eb6179c90090d5b05f97a66b50cf78ce50e6f56
-SHA1 (patch-ad) = 0af2e62c4a1469d03b3999cf0864c62e28d95ed0
-SHA1 (patch-ae) = 3bba21641c64d572a845966e6600d686e6d86983
 SHA1 (patch-ba) = f9a576b74a7039167aee57d9583ac99e9cbf70a1
 SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
 SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
 SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
-SHA1 (patch-cw) = 0265eeebfe488ec6d795ee28f45a26b65a7976db
+SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
+SHA1 (patch-cy) = 6fcaa3284442b19f6580173ac8753d9216fa10cf
diff --git a/sysutils/xenkernel3/patches/patch-ab b/sysutils/xenkernel3/patches/patch-ab
deleted file mode 100644
index d4b31b8cb78..00000000000
--- a/sysutils/xenkernel3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/08/17 17:26:04 bouyer Exp $
-
---- ./xen/arch/x86/shutdown.c.orig	2007-08-16 21:52:39.000000000 +0200
-+++ ./xen/arch/x86/shutdown.c	2007-08-16 21:53:03.000000000 +0200
-@@ -197,7 +197,7 @@
- 
- #endif
- 
--void machine_restart(char * __unused)
-+void machine_restart(char * __unused u)
- {
-     int i;
- 
diff --git a/sysutils/xenkernel3/patches/patch-ac b/sysutils/xenkernel3/patches/patch-ac
deleted file mode 100644
index 87b58806b74..00000000000
--- a/sysutils/xenkernel3/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/08/17 17:26:04 bouyer Exp $
-
---- xen/tools/symbols.c.orig	2007-08-16 21:46:28.000000000 +0200
-+++ xen/tools/symbols.c	2007-08-16 21:51:22.000000000 +0200
-@@ -103,7 +103,7 @@
- 		_sextratext = s->addr;
- 	else if (strcmp(sym, "_eextratext") == 0)
- 		_eextratext = s->addr;
--	else if (toupper(stype) == 'A')
-+	else if (toupper((int)stype) == 'A')
- 	{
- 		/* Keep these useful absolute symbols */
- 		if (strcmp(sym, "__kernel_syscall_via_break") &&
-@@ -113,7 +113,7 @@
- 			return -1;
- 
- 	}
--	else if (toupper(stype) == 'U' ||
-+	else if (toupper((int)stype) == 'U' ||
- 		 is_arm_mapping_symbol(sym))
- 		return -1;
- 	/* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
diff --git a/sysutils/xenkernel3/patches/patch-ad b/sysutils/xenkernel3/patches/patch-ad
deleted file mode 100644
index 4af0bcad2f8..00000000000
--- a/sysutils/xenkernel3/patches/patch-ad
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/08/17 17:26:04 bouyer Exp $
-
---- config/NetBSD.mk.orig	2007-08-16 21:44:15.000000000 +0200
-+++ config/NetBSD.mk	2007-08-16 21:44:08.000000000 +0200
-@@ -0,0 +1 @@
-+include $(XEN_ROOT)/config/StdGNU.mk
diff --git a/sysutils/xenkernel3/patches/patch-ae b/sysutils/xenkernel3/patches/patch-ae
deleted file mode 100644
index 0830d2d99f1..00000000000
--- a/sysutils/xenkernel3/patches/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/10/16 20:31:57 bouyer Exp $
-
---- xen/arch/x86/mm.c.orig	2007-05-18 16:45:21.000000000 +0200
-+++ xen/arch/x86/mm.c	2007-10-17 05:03:09.000000000 +0200
-@@ -1741,15 +1741,26 @@
-                     nx |= PGT_validated;
-             }
-         }
--        else if ( unlikely((x & (PGT_type_mask|PGT_pae_xen_l2)) != type) )
-+        else if (unlikely((x & (PGT_type_mask|PGT_pae_xen_l2)) != type) )
-         {
--            if ( ((x & PGT_type_mask) != PGT_l2_page_table) ||
--                 (type != PGT_l1_page_table) )
--                MEM_LOG("Bad type (saw %" PRtype_info
--                        " != exp %" PRtype_info ") "
--                        "for mfn %lx (pfn %lx)",
--                        x, type, page_to_mfn(page),
--                        get_gpfn_from_mfn(page_to_mfn(page)));
-+	    /*
-+	     * if it's a recursive mapping failure here is expected.
-+	     * Don't log it
-+	     */
-+	    if ((x & PGT_type_mask) == PGT_l2_page_table &&
-+		type == PGT_l1_page_table)
-+			return 0;
-+	    if ((x & PGT_type_mask) == PGT_l3_page_table &&
-+		type == PGT_l2_page_table)
-+			return 0;
-+	    if ((x & PGT_type_mask) == PGT_l4_page_table &&
-+		type == PGT_l3_page_table)
-+			return 0;
-+            MEM_LOG("Bad type (saw %" PRtype_info
-+                    " != exp %" PRtype_info ") "
-+                    "for mfn %lx (pfn %lx)",
-+                    x, type, page_to_mfn(page),
-+                    get_gpfn_from_mfn(page_to_mfn(page)));
-             return 0;
-         }
-         else if ( unlikely(!(x & PGT_validated)) )
diff --git a/sysutils/xenkernel3/patches/patch-cw b/sysutils/xenkernel3/patches/patch-cw
index 7a923c3e6aa..143dacc787b 100644
--- a/sysutils/xenkernel3/patches/patch-cw
+++ b/sysutils/xenkernel3/patches/patch-cw
@@ -1,3 +1,5 @@
+$NetBSD: patch-cw,v 1.2 2007/12/03 21:54:30 bouyer Exp $
+
 --- Config.mk.orig	2007-11-21 13:26:05.000000000 +0100
 +++ Config.mk	2007-11-21 13:26:40.000000000 +0100
 @@ -4,7 +4,8 @@
diff --git a/sysutils/xenkernel3/patches/patch-cy b/sysutils/xenkernel3/patches/patch-cy
new file mode 100644
index 00000000000..5f43b4dc597
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-cy
@@ -0,0 +1,15 @@
+$NetBSD: patch-cy,v 1.1 2007/12/03 21:54:30 bouyer Exp $
+
+--- xen/arch/x86/domain_build.c.orig	2007-12-03 21:59:10.000000000 +0100
++++ xen/arch/x86/domain_build.c	2007-12-03 22:01:57.000000000 +0100
+@@ -768,6 +768,10 @@
+             l1start = l1tab = l2e_to_l1e(*l2tab);
+         }
+     }
++    /* make sure remaining entries are clear */
++    l4tab = l4start;
++    for ( count = 0; count < ROOT_PAGETABLE_FIRST_XEN_SLOT; count++)
++	l4tab[count].l4 = 0;
+ 
+ #endif /* __x86_64__ */
+