@@ -34,6 +34,12 @@
#define __LINUX_PUBLIC_GNTDEV_H__
#include <linux/types.h>
+#include <xen/privcmd.h>
+
+/*
+ * Reference to a grant entry in a specified domain's grant table.
+ */
+typedef __u32 grant_ref_t;
struct ioctl_gntdev_grant_ref {
/* The domain ID of the grant to be mapped. */
@@ -29,6 +29,7 @@
#define __XEN_PUBLIC_GRANT_TABLE_H__
#include <xen/interface/xen.h>
+#include <uapi/xen/gntdev.h> /* for grant_ref_t */
/***********************************
* GRANT TABLE REPRESENTATION
@@ -85,11 +86,6 @@
*/
/*
- * Reference to a grant entry in a specified domain's grant table.
- */
-typedef uint32_t grant_ref_t;
-
-/*
* A grant table comprises a packed array of grant entries in one or more
* page frames shared between Xen and a guest.
* [XEN]: This field is written by Xen and read by the sharing guest.
Both are needed to compile <xen/gntdev.h> wihtout compiler warnings in userspace. Fixes these userspace compile errors: xen/gntdev.h:151:4: error: unknown type name ‘grant_ref_t’ grant_ref_t ref; ^ xen/gntdev.h:153:4: error: unknown type name ‘domid_t’ domid_t domid; ^ Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> --- include/uapi/xen/gntdev.h | 6 ++++++ include/xen/interface/grant_table.h | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-)