[src/trunk]: src/sys/arch/xen/include/xen-public/arch-x86 re-apply merge loss

[cegger <cegger%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bfac4def6ba3
branches:  trunk
changeset: 771930:bfac4def6ba3
user:      cegger <cegger%NetBSD.org@localhost>
date:      Fri Dec 09 10:14:20 2011 +0000

description:
re-apply merge loss

diffstat:

 sys/arch/xen/include/xen-public/arch-x86/xen.h |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 71d8e4a23690 -r bfac4def6ba3 sys/arch/xen/include/xen-public/arch-x86/xen.h
--- a/sys/arch/xen/include/xen-public/arch-x86/xen.h    Fri Dec 09 10:08:47 2011 +0000
+++ b/sys/arch/xen/include/xen-public/arch-x86/xen.h    Fri Dec 09 10:14:20 2011 +0000
@@ -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"