[Xen-users] Re: [Xen-devel] Re: Xen 4.0.1 failed to compile on Ubuntu Natty 32 bits

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2010-12-15 at 22:15 +0000, Martinx - ジェームズ wrote:
>         
>         gcc  -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls
>         -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall
>         -Wstrict-prototypes -Wno-unused-value
>         -Wdeclaration-after-statement  -D__XEN_TOOLS__ -MMD
>         -MF .blk_linux.o.d -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
>         -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
>         -mno-tls-direct-seg-refs -Werror -Wno-unused -I../lib
>         -I../../../tools/libxc -I../../../tools/include
>         -I../../../tools/xenstore -I../../../tools/include
>         -I ../../libaio/src -I ../../memshr -D_GNU_SOURCE -DMEMSHR -c
>         -o blk_linux.o blk_linux.c
>         cc1: warnings being treated as errors
>         In file included from tapdisk.h:62:0,
>                          from blk_linux.c:4:
>         ../lib/blktaplib.h:199:0: error: "WRITE" redefined
>         /usr/include/linux/fs.h:160:0: note: this is the location of
>         the previous definition

The headers on natty appear to include a definition of WRITE which
conflicts with the use of that name in blktap.

This should avoid the issue.

Ian.

8<---------------------------------------

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1292492034 0
# Node ID 0236d8adb081b93e509ec52654201ce88ad6570b
# Parent  d70d7c3311c495305ac1bde256122b09c58463e5
blktap[12]: include <sys/mount.h> instead of <linux/fs.h>

The former is a userspace sanitised header which contains the
definitions we need. In some distros linux/fs.h defines WRITE which
conflicts with blktaps own use of that name.

Also there is no reason to use <linux/errno.h> over the more normal
<errno.h>.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap/drivers/blk_linux.c
--- a/tools/blktap/drivers/blk_linux.c  Tue Dec 14 17:10:49 2010 +0000
+++ b/tools/blktap/drivers/blk_linux.c  Thu Dec 16 09:33:54 2010 +0000
@@ -1,6 +1,6 @@
 #include <inttypes.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
+#include <sys/mount.h>
 #include "tapdisk.h"
 #include "blk.h"
 
diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap2/drivers/blk_linux.c
--- a/tools/blktap2/drivers/blk_linux.c Tue Dec 14 17:10:49 2010 +0000
+++ b/tools/blktap2/drivers/blk_linux.c Thu Dec 16 09:33:54 2010 +0000
@@ -1,7 +1,7 @@
 #include <inttypes.h>
+#include <errno.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
-#include <linux/errno.h>
+#include <sys/mount.h>
 #include "tapdisk.h"
 #include "blk.h"
 



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