diff options
| author | Ian Campbell <Ian.Campbell@citrix.com> | 2012-10-18 09:34:58 +0100 |
|---|---|---|
| committer | Ian Campbell <Ian.Campbell@citrix.com> | 2012-10-18 09:34:58 +0100 |
| commit | 2f65b96e850e6ef1154d304cc3fe9efba84222e1 (patch) | |
| tree | 55d9daaf3d192ed7bdfa1f5faf9882916439be7c | |
| parent | ad2d8b12c34893b127496019aac4f6e16ba1a75a (diff) | |
| download | xen-2f65b96e850e6ef1154d304cc3fe9efba84222e1.tar.gz xen-2f65b96e850e6ef1154d304cc3fe9efba84222e1.tar.bz2 xen-2f65b96e850e6ef1154d304cc3fe9efba84222e1.zip | |
xen: retain ulong guest handle for older consumers.
26072:5529b91bd2e4 removed this but we need to keep it around for
older consumers. Bump __XEN_LATEST_INTERFACE_VERSION__ accordingly.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | xen/include/public/grant_table.h | 4 | ||||
| -rw-r--r-- | xen/include/public/xen-compat.h | 2 | ||||
| -rw-r--r-- | xen/include/public/xen.h | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/xen/include/public/grant_table.h b/xen/include/public/grant_table.h index 13cc559447..e84fbcffec 100644 --- a/xen/include/public/grant_table.h +++ b/xen/include/public/grant_table.h @@ -385,7 +385,11 @@ struct gnttab_setup_table { uint32_t nr_frames; /* OUT parameters. */ int16_t status; /* => enum grant_status */ +#if __XEN_INTERFACE_VERSION__ < 0x00040300 + XEN_GUEST_HANDLE(ulong) frame_list; +#else XEN_GUEST_HANDLE(xen_pfn_t) frame_list; +#endif }; typedef struct gnttab_setup_table gnttab_setup_table_t; DEFINE_XEN_GUEST_HANDLE(gnttab_setup_table_t); diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index d8c55bfc8f..69141c403f 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040200 +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040300 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 9a5b394f03..7352d1edb0 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -43,6 +43,10 @@ DEFINE_XEN_GUEST_HANDLE(char); __DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char); DEFINE_XEN_GUEST_HANDLE(int); __DEFINE_XEN_GUEST_HANDLE(uint, unsigned int); +#if __XEN_INTERFACE_VERSION__ < 0x00040300 +DEFINE_XEN_GUEST_HANDLE(long); +__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long); +#endif DEFINE_XEN_GUEST_HANDLE(void); DEFINE_XEN_GUEST_HANDLE(uint64_t); |