some device have I/O space but no mem space so checking iomem to grant

privileges to non-0 domains is not enough.
PKGREVISION++

4 files changed, 44 insertions, 3 deletions

diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index b21e1225186..312c155f2e8 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2008/10/28 16:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/01/24 18:57:59 bouyer Exp $
 #
 
 VERSION=	3.1.4
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel3-${VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 EXTRACT_SUFX=	.tar.gz
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 5553b41b28d..1893c138152 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/04/27 19:59:40 bouyer Exp $
+$NetBSD: distinfo,v 1.11 2009/01/24 18:57:59 bouyer Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
@@ -9,3 +9,5 @@ SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
 SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
 SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
 SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
+SHA1 (patch-da) = 6db74e00d15615e71936fa8637a05159f378b454
+SHA1 (patch-db) = 8e7b563fd816669fd39e1e8bf5137b5937060968
diff --git a/sysutils/xenkernel3/patches/patch-da b/sysutils/xenkernel3/patches/patch-da
new file mode 100644
index 00000000000..cf7226d1eaf
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-da
@@ -0,0 +1,24 @@
+$NetBSD: patch-da,v 1.1 2009/01/24 18:57:59 bouyer Exp $
+
+some device have I/O space but no mem space so checking iomem to grant
+privileges is not enough.
+
+--- xen/include/xen/iocap.h.orig	2009-01-24 17:21:41.000000000 +0100
++++ xen/include/xen/iocap.h	2009-01-24 17:22:05.000000000 +0100
+@@ -29,7 +29,7 @@
+     rangeset_contains_singleton((d)->irq_caps, i)
+ 
+ #define multipage_allocation_permitted(d)               \
+-    (!rangeset_is_empty((d)->iomem_caps))
++    (!rangeset_is_empty((d)->iomem_caps) || !rangeset_is_empty((d)->arch.ioport_caps))
+ 
+ /*
+  * Until TLB flushing issues are sorted out we consider it unsafe for
+@@ -37,6 +37,6 @@
+  * operations.
+  */
+ #define grant_operation_permitted(d)                    \
+-    (!rangeset_is_empty((d)->iomem_caps))
++    (!rangeset_is_empty((d)->iomem_caps) || !rangeset_is_empty((d)->arch.ioport_caps))
+ 
+ #endif /* __XEN_IOCAP_H__ */
diff --git a/sysutils/xenkernel3/patches/patch-db b/sysutils/xenkernel3/patches/patch-db
new file mode 100644
index 00000000000..cd44ad868cf
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-db
@@ -0,0 +1,15 @@
+$NetBSD: patch-db,v 1.1 2009/01/24 18:57:59 bouyer Exp $
+
+some device have I/O space but no mem space so checking iomem to grant
+privileges is not enough.
+
+--- xen/include/asm-x86/iocap.h.orig	2009-01-24 17:22:41.000000000 +0100
++++ xen/include/asm-x86/iocap.h	2009-01-24 17:23:24.000000000 +0100
+@@ -15,6 +15,6 @@
+     rangeset_contains_range((d)->arch.ioport_caps, s, e)
+ 
+ #define cache_flush_permitted(d)                       \
+-    (!rangeset_is_empty((d)->iomem_caps))
++    (!rangeset_is_empty((d)->iomem_caps) || !rangeset_is_empty((d)->arch.ioport_caps))
+ 
+ #endif /* __X86_IOCAP_H__ */