Module Name: src
Committed By: cegger
Date: Fri Dec 9 10:14:20 UTC 2011
Modified Files:
src/sys/arch/xen/include/xen-public/arch-x86: xen.h
Log Message:
re-apply merge loss
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/arch/xen/include/xen-public/arch-x86/xen.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/include/xen-public/arch-x86/xen.h
diff -u src/sys/arch/xen/include/xen-public/arch-x86/xen.h:1.1.1.2 src/sys/arch/xen/include/xen-public/arch-x86/xen.h:1.2
--- src/sys/arch/xen/include/xen-public/arch-x86/xen.h:1.1.1.2 Wed Dec 7 14:41:17 2011
+++ src/sys/arch/xen/include/xen-public/arch-x86/xen.h Fri Dec 9 10:14:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xen.h,v 1.1.1.2 2011/12/07 14:41:17 cegger Exp $ */
+/* $NetBSD: xen.h,v 1.2 2011/12/09 10:14:20 cegger Exp $ */
/******************************************************************************
* arch-x86/xen.h
*
@@ -46,10 +46,14 @@
#define __XEN_GUEST_HANDLE(name) __guest_handle_ ## name
#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name)
#define set_xen_guest_handle_raw(hnd, val) do { (hnd).p = val; } while (0)
-#ifdef __XEN_TOOLS__
+
+#if __XEN_INTERFACE_VERSION__ >= 0x00030201
+#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
#define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0)
+#else
+#define set_xen_guest_handle(hnd, val) (hnd) = val
+#define get_xen_guest_handle(val, hnd) val = (hnd)
#endif
-#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
#if defined(__i386__)
#include "xen-x86_32.h"
