lkml.org 
[lkml]   [2016]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v05 55/72] include/uapi/xen/gntdev.h: include xen/privcmd.h and define grant_ref_t
    Date
    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(-)

    diff --git a/include/uapi/xen/gntdev.h b/include/uapi/xen/gntdev.h
    index d066197..f208706 100644
    --- a/include/uapi/xen/gntdev.h
    +++ b/include/uapi/xen/gntdev.h
    @@ -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. */
    diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
    index 56806bc..7e064d6 100644
    --- a/include/xen/interface/grant_table.h
    +++ b/include/xen/interface/grant_table.h
    @@ -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.
    --
    2.8.1
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:4.057 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site