[Xen-changelog] [xen-unstable] Fix PCI passthrough for devices w/o iomem.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1233846533 0
# Node ID 92557a0b021fe02a69f6ce7fc5660d50b8f092c8
# Parent  a2a755b7927e61f2ebd25cb7c6071a8c8f71063d
Fix PCI passthrough for devices w/o iomem.

From: Manuel Bouyer <bouyer@xxxxxxxxxx>
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
 xen/include/asm-x86/iocap.h |    5 +++--
 xen/include/xen/iocap.h     |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff -r a2a755b7927e -r 92557a0b021f xen/include/asm-x86/iocap.h
--- a/xen/include/asm-x86/iocap.h       Thu Feb 05 12:20:18 2009 +0000
+++ b/xen/include/asm-x86/iocap.h       Thu Feb 05 15:08:53 2009 +0000
@@ -14,7 +14,8 @@
 #define ioports_access_permitted(d, s, e)               \
     rangeset_contains_range((d)->arch.ioport_caps, s, e)
 
-#define cache_flush_permitted(d)                       \
-    (!rangeset_is_empty((d)->iomem_caps))
+#define cache_flush_permitted(d)                        \
+    (!rangeset_is_empty((d)->iomem_caps) ||             \
+     !rangeset_is_empty((d)->arch.ioport_caps))
 
 #endif /* __X86_IOCAP_H__ */
diff -r a2a755b7927e -r 92557a0b021f xen/include/xen/iocap.h
--- a/xen/include/xen/iocap.h   Thu Feb 05 12:20:18 2009 +0000
+++ b/xen/include/xen/iocap.h   Thu Feb 05 15:08:53 2009 +0000
@@ -29,6 +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))
 
 #endif /* __XEN_IOCAP_H__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog