[Xen-changelog] [xen-4.0-testing] io: make shared ring pad field less enticing for users by adding a __ prefix

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1282069640 -3600
# Node ID 7b8b976f534e26508f62f1900d7721147dc32980
# Parent  08735667ed62b31236845b8e14d739143403f68d
io: make shared ring pad field less enticing for users by adding a __ prefix

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Daniel Stodden <daniel.stodden@xxxxxxxxxx>
Cc: Dongxiao Xu <dongxiao.xu@xxxxxxxxx>
xen-unstable changeset:   a8c5e5e12ec1
xen-unstable date:        Fri Jul 02 18:58:28 2010 +0100
---
 xen/include/public/io/ring.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 08735667ed62 -r 7b8b976f534e xen/include/public/io/ring.h
--- a/xen/include/public/io/ring.h      Sun Aug 15 21:48:06 2010 +0100
+++ b/xen/include/public/io/ring.h      Tue Aug 17 19:27:20 2010 +0100
@@ -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
 #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 {                            \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog