[Xen-changelog] [xen-unstable] XEN_GUEST_HANDLE_00030205() compat macro is broken. Remove it and

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200997138 0
# Node ID 491c283207945c5acdad8f9bc1f64c76511d83b6
# Parent  6f3fb3f86b68182bb61a661e81f346f653005852
XEN_GUEST_HANDLE_00030205() compat macro is broken. Remove it and
open-code an alternative at its two invocation sites.

Based on a patch by Jan Beulich.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/include/public/physdev.h    |    6 +++++-
 xen/include/public/xen-compat.h |    7 -------
 xen/include/public/xen.h        |    6 +++++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff -r 6f3fb3f86b68 -r 491c28320794 xen/include/public/physdev.h
--- a/xen/include/public/physdev.h      Tue Jan 22 09:51:49 2008 +0000
+++ b/xen/include/public/physdev.h      Tue Jan 22 10:18:58 2008 +0000
@@ -81,7 +81,11 @@ DEFINE_XEN_GUEST_HANDLE(physdev_set_iopl
 #define PHYSDEVOP_set_iobitmap           7
 struct physdev_set_iobitmap {
     /* IN */
-    XEN_GUEST_HANDLE_00030205(uint8) bitmap;
+#if __XEN_INTERFACE_VERSION__ >= 0x00030205
+    XEN_GUEST_HANDLE(uint8) bitmap;
+#else
+    uint8_t *bitmap;
+#endif
     uint32_t nr_ports;
 };
 typedef struct physdev_set_iobitmap physdev_set_iobitmap_t;
diff -r 6f3fb3f86b68 -r 491c28320794 xen/include/public/xen-compat.h
--- a/xen/include/public/xen-compat.h   Tue Jan 22 09:51:49 2008 +0000
+++ b/xen/include/public/xen-compat.h   Tue Jan 22 10:18:58 2008 +0000
@@ -41,11 +41,4 @@
 #error "These header files do not support the requested interface version."
 #endif
 
-/* Fields defined as a Xen guest handle since 0x00030205. */
-#if __XEN_INTERFACE_VERSION__ >= 0x00030205
-#define XEN_GUEST_HANDLE_00030205(type) XEN_GUEST_HANDLE(type)
-#else
-#define XEN_GUEST_HANDLE_00030205(type) type *
-#endif
-
 #endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */
diff -r 6f3fb3f86b68 -r 491c28320794 xen/include/public/xen.h
--- a/xen/include/public/xen.h  Tue Jan 22 09:51:49 2008 +0000
+++ b/xen/include/public/xen.h  Tue Jan 22 10:18:58 2008 +0000
@@ -263,7 +263,11 @@ struct mmuext_op {
         /* SET_LDT */
         unsigned int nr_ents;
         /* TLB_FLUSH_MULTI, INVLPG_MULTI */
-        XEN_GUEST_HANDLE_00030205(void) vcpumask;
+#if __XEN_INTERFACE_VERSION__ >= 0x00030205
+        XEN_GUEST_HANDLE(void) vcpumask;
+#else
+        void *vcpumask;
+#endif
     } arg2;
 };
 typedef struct mmuext_op mmuext_op_t;

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