[Xen-changelog] [xen-3.4-testing] blktap: provide a variant of __RING_SIZE() that is an integer constant expression

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1268158316 0
# Node ID 61623562ecbd0eca2eaf6143edf22613dc6900b5
# Parent  0489c4f40f243deb206cc24ff19390cd770533d0
blktap: provide a variant of __RING_SIZE() that is an integer constant 
expression

Without this new variant, gcc 4.5 won't compile where this is being
used to specify array sizes.  See also c/s 20975.

Signed-off-by: Charles Arnold <carnold@xxxxxxxxxx>
xen-unstable changeset:   21005:0d85c05b1554
xen-unstable date:        Sat Mar 06 13:31:03 2010 +0000
---
 tools/blktap/lib/blktaplib.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 0489c4f40f24 -r 61623562ecbd tools/blktap/lib/blktaplib.h
--- a/tools/blktap/lib/blktaplib.h      Tue Mar 09 18:09:54 2010 +0000
+++ b/tools/blktap/lib/blktaplib.h      Tue Mar 09 18:11:56 2010 +0000
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#define BLK_RING_SIZE __RING_SIZE((blkif_sring_t *)0, XC_PAGE_SIZE)
+#define BLK_RING_SIZE __CONST_RING_SIZE(blkif, XC_PAGE_SIZE)
 
 /* size of the extra VMA area to map in attached pages. */
 #define BLKTAP_VMA_PAGES BLK_RING_SIZE

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