# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1261031869 0
# Node ID 981db8d78913016a0dbfa041e106b3404b5f5791
# Parent c4572f01675ed0a3fe5284e437383d925265a247
Update to grant_table.h to sync with xen/include/public
Signed-off-by: Grzegorz Milos <Grzegorz.Milos@xxxxxxxxxx>
---
include/xen/interface/grant_table.h | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletion(-)
diff -r c4572f01675e -r 981db8d78913 include/xen/interface/grant_table.h
--- a/include/xen/interface/grant_table.h Thu Dec 17 06:37:49 2009 +0000
+++ b/include/xen/interface/grant_table.h Thu Dec 17 06:37:49 2009 +0000
@@ -298,6 +298,8 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_
#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
#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
#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
"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__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home