From: Keir Fraser Date: Thu, 17 Dec 2009 06:37:49 +0000 (+0000) Subject: Update to grant_table.h to sync with xen/include/public X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ebdc90430dee6d7d6158c79952ca5fd386ad9730;p=legacy%2Flinux-2.6.18-xen.git Update to grant_table.h to sync with xen/include/public Signed-off-by: Grzegorz Milos --- diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h index 71f125a3..0ca1287f 100644 --- a/include/xen/interface/grant_table.h +++ b/include/xen/interface/grant_table.h @@ -298,6 +298,8 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_t); #define GNTCOPY_source_gref (1<<_GNTCOPY_source_gref) #define _GNTCOPY_dest_gref (1) #define GNTCOPY_dest_gref (1<<_GNTCOPY_dest_gref) +#define _GNTCOPY_can_fail (2) +#define GNTCOPY_can_fail (1<<_GNTCOPY_can_fail) #define GNTTABOP_copy 5 typedef struct gnttab_copy { @@ -388,6 +390,9 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_unmap_and_replace_t); #define _GNTMAP_contains_pte (4) #define GNTMAP_contains_pte (1<<_GNTMAP_contains_pte) +#define _GNTMAP_can_fail (5) +#define GNTMAP_can_fail (1<<_GNTMAP_can_fail) + /* * Bits to be placed in guest kernel available PTE bits (architecture * dependent; only supported when XENFEAT_gnttab_map_avail_bits is set). @@ -410,6 +415,7 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_unmap_and_replace_t); #define GNTST_bad_page (-9) /* Specified page was invalid for op. */ #define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary. */ #define GNTST_address_too_big (-11) /* transfer page address too large. */ +#define GNTST_eagain (-12) /* Could not map at the moment. Retry. */ #define GNTTABOP_error_msgs { \ "okay", \ @@ -423,7 +429,8 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_unmap_and_replace_t); "permission denied", \ "bad page", \ "copy arguments cross page boundary", \ - "page address size too large" \ + "page address size too large", \ + "could not map at the moment, retry" \ } #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */