From: Jan Beulich Date: Wed, 16 Aug 2017 09:02:10 +0000 (+0200) Subject: gnttab: move GNTPIN_* out of header file X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1681 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5a4e6ee31c67822dc4681b12d2ce941ca68f4deb;p=xen.git gnttab: move GNTPIN_* out of header file They're private to grant_table.c. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 5e578c69ff..5bfaf3889c 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -158,7 +158,24 @@ shared_entry_header(struct grant_table *t, grant_ref_t ref) /* Active grant entry - used for shadowing GTF_permit_access grants. */ struct active_grant_entry { - u32 pin; /* Reference count information. */ + uint32_t pin; /* Reference count information: */ + /* Count of writable host-CPU mappings. */ +#define GNTPIN_hstw_shift 0 +#define GNTPIN_hstw_inc (1U << GNTPIN_hstw_shift) +#define GNTPIN_hstw_mask (0xFFU << GNTPIN_hstw_shift) + /* Count of read-only host-CPU mappings. */ +#define GNTPIN_hstr_shift 8 +#define GNTPIN_hstr_inc (1U << GNTPIN_hstr_shift) +#define GNTPIN_hstr_mask (0xFFU << GNTPIN_hstr_shift) + /* Count of writable device-bus mappings. */ +#define GNTPIN_devw_shift 16 +#define GNTPIN_devw_inc (1U << GNTPIN_devw_shift) +#define GNTPIN_devw_mask (0xFFU << GNTPIN_devw_shift) + /* Count of read-only device-bus mappings. */ +#define GNTPIN_devr_shift 24 +#define GNTPIN_devr_inc (1U << GNTPIN_devr_shift) +#define GNTPIN_devr_mask (0xFFU << GNTPIN_devr_shift) + domid_t domid; /* Domain being granted access. */ struct domain *trans_domain; uint32_t trans_gref; diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 6bf5cb27e3..af269a108d 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -29,23 +29,6 @@ #include #include - /* Count of writable host-CPU mappings. */ -#define GNTPIN_hstw_shift (0) -#define GNTPIN_hstw_inc (1 << GNTPIN_hstw_shift) -#define GNTPIN_hstw_mask (0xFFU << GNTPIN_hstw_shift) - /* Count of read-only host-CPU mappings. */ -#define GNTPIN_hstr_shift (8) -#define GNTPIN_hstr_inc (1 << GNTPIN_hstr_shift) -#define GNTPIN_hstr_mask (0xFFU << GNTPIN_hstr_shift) - /* Count of writable device-bus mappings. */ -#define GNTPIN_devw_shift (16) -#define GNTPIN_devw_inc (1 << GNTPIN_devw_shift) -#define GNTPIN_devw_mask (0xFFU << GNTPIN_devw_shift) - /* Count of read-only device-bus mappings. */ -#define GNTPIN_devr_shift (24) -#define GNTPIN_devr_inc (1 << GNTPIN_devr_shift) -#define GNTPIN_devr_mask (0xFFU << GNTPIN_devr_shift) - #ifndef DEFAULT_MAX_NR_GRANT_FRAMES /* to allow arch to override */ /* Default maximum size of a grant table. [POLICY] */ #define DEFAULT_MAX_NR_GRANT_FRAMES 32