1.1 --- a/xen/include/public/physdev.h	Tue Jan 22 09:51:49 2008 +0000
     1.2 +++ b/xen/include/public/physdev.h	Tue Jan 22 10:18:58 2008 +0000
     1.3 @@ -81,7 +81,11 @@ DEFINE_XEN_GUEST_HANDLE(physdev_set_iopl
     1.4  #define PHYSDEVOP_set_iobitmap           7
     1.5  struct physdev_set_iobitmap {
     1.6      /* IN */
     1.7 -    XEN_GUEST_HANDLE_00030205(uint8) bitmap;
     1.8 +#if __XEN_INTERFACE_VERSION__ >= 0x00030205
     1.9 +    XEN_GUEST_HANDLE(uint8) bitmap;
    1.10 +#else
    1.11 +    uint8_t *bitmap;
    1.12 +#endif
    1.13      uint32_t nr_ports;
    1.14  };
    1.15  typedef struct physdev_set_iobitmap physdev_set_iobitmap_t;

     2.1 --- a/xen/include/public/xen-compat.h	Tue Jan 22 09:51:49 2008 +0000
     2.2 +++ b/xen/include/public/xen-compat.h	Tue Jan 22 10:18:58 2008 +0000
     2.3 @@ -41,11 +41,4 @@
     2.4  #error "These header files do not support the requested interface version."
     2.5  #endif
     2.6  
     2.7 -/* Fields defined as a Xen guest handle since 0x00030205. */
     2.8 -#if __XEN_INTERFACE_VERSION__ >= 0x00030205
     2.9 -#define XEN_GUEST_HANDLE_00030205(type) XEN_GUEST_HANDLE(type)
    2.10 -#else
    2.11 -#define XEN_GUEST_HANDLE_00030205(type) type *
    2.12 -#endif
    2.13 -
    2.14  #endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */

     3.1 --- a/xen/include/public/xen.h	Tue Jan 22 09:51:49 2008 +0000
     3.2 +++ b/xen/include/public/xen.h	Tue Jan 22 10:18:58 2008 +0000
     3.3 @@ -263,7 +263,11 @@ struct mmuext_op {
     3.4          /* SET_LDT */
     3.5          unsigned int nr_ents;
     3.6          /* TLB_FLUSH_MULTI, INVLPG_MULTI */
     3.7 -        XEN_GUEST_HANDLE_00030205(void) vcpumask;
     3.8 +#if __XEN_INTERFACE_VERSION__ >= 0x00030205
     3.9 +        XEN_GUEST_HANDLE(void) vcpumask;
    3.10 +#else
    3.11 +        void *vcpumask;
    3.12 +#endif
    3.13      } arg2;
    3.14  };
    3.15  typedef struct mmuext_op mmuext_op_t;