aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-08-17 19:27:20 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-08-17 19:27:20 +0100
commita14a09796cc303c70c74c737d3a030e63ac8a926 (patch)
treecd6f1523513f9e7181f56baaeef2cff6901325bd
parentf8eebecbe9895e31801f6aba6053823c35bb5f34 (diff)
downloadxen-a14a09796cc303c70c74c737d3a030e63ac8a926.tar.gz
xen-a14a09796cc303c70c74c737d3a030e63ac8a926.tar.bz2
xen-a14a09796cc303c70c74c737d3a030e63ac8a926.zip
io: make shared ring pad field less enticing for users by adding a __ prefix
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: Daniel Stodden <daniel.stodden@citrix.com> Cc: Dongxiao Xu <dongxiao.xu@intel.com> xen-unstable changeset: a8c5e5e12ec1 xen-unstable date: Fri Jul 02 18:58:28 2010 +0100
-rw-r--r--xen/include/public/io/ring.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
index 0c01339722..38b70519a9 100644
--- a/xen/include/public/io/ring.h
+++ b/xen/include/public/io/ring.h
@@ -112,7 +112,7 @@ struct __name##_sring { \
} tapif_user; \
uint8_t pvt_pad[4]; \
} private; \
- uint8_t pad[44]; \
+ uint8_t __pad[44]; \
union __name##_sring_entry ring[1]; /* variable-length */ \
}; \
\
@@ -156,7 +156,8 @@ typedef struct __name##_back_ring __name##_back_ring_t
#define SHARED_RING_INIT(_s) do { \
(_s)->req_prod = (_s)->rsp_prod = 0; \
(_s)->req_event = (_s)->rsp_event = 1; \
- (void)memset((_s)->pad, 0, sizeof((_s)->pad)); \
+ (void)memset((_s)->private.pvt_pad, 0, sizeof((_s)->private.pvt_pad)); \
+ (void)memset((_s)->__pad, 0, sizeof((_s)->__pad)); \
} while(0)
#define FRONT_RING_INIT(_r, _s, __size) do { \