[Xen-devel] [PATCH] linux/x86: don't hardcode is_running_on_xen() for pv drivers

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

Allowing graceful failure of these modules when inadvertently loaded on
native kernels.

Almost as usual, written and tested on 2.6.16.54 and made apply to the
2.6.18 tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- a/include/asm-i386/mach-xen/asm/hypervisor.h
+++ b/include/asm-i386/mach-xen/asm/hypervisor.h
@@ -145,7 +145,12 @@ u64 jiffies_to_st(unsigned long jiffies)
 #define MULTI_UVMDOMID_INDEX 4
 #endif
 
+#ifdef CONFIG_XEN
 #define is_running_on_xen() 1
+#else
+extern char *hypercall_stubs;
+#define is_running_on_xen() (!!hypercall_stubs)
+#endif
 
 static inline int
 HYPERVISOR_yield(




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