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

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267882263 0
# Node ID 0d85c05b1554ac1fcfd3798315349e84cf259caa
# Parent  b82dd03944e00c55c7faf56c117b2a9eb4ea9ce2
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>
---
 tools/blktap/lib/blktaplib.h      |    2 +-
 tools/blktap2/include/blktaplib.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r b82dd03944e0 -r 0d85c05b1554 tools/blktap/lib/blktaplib.h
--- a/tools/blktap/lib/blktaplib.h      Fri Mar 05 14:42:25 2010 +0000
+++ b/tools/blktap/lib/blktaplib.h      Sat Mar 06 13:31:03 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
diff -r b82dd03944e0 -r 0d85c05b1554 tools/blktap2/include/blktaplib.h
--- a/tools/blktap2/include/blktaplib.h Fri Mar 05 14:42:25 2010 +0000
+++ b/tools/blktap2/include/blktaplib.h Sat Mar 06 13:31:03 2010 +0000
@@ -45,7 +45,7 @@
 #define EPRINTF(_f, _a...) syslog(LOG_ERR, "tap-err:%s: " _f, __func__, ##_a)
 #define PERROR(_f, _a...)  EPRINTF(_f ": %s", ##_a, strerror(errno))
 
-#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