From: Steven Noonan <snoonan@amazon.com>
Date: Thu, 9 Jan 2014 21:55:07 +0000 (-0800)
Subject: virtfs-proxy-helper.c: fix compile error
X-Git-Tag: accepted/tizen/generic/20140207.095458^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_generic;p=platform%2Fupstream%2Fqemu.git

virtfs-proxy-helper.c: fix compile error

This is caused by a linux/xattr.h and sys/xattr.h incompatibility:

    In file included from /home/snoonan/Development/qemu/include/qemu/xattr.h:27:0,
		     from fsdev/virtfs-proxy-helper.c:25:
    /usr/include/sys/xattr.h:31:3: error: expected identifier before numeric constant
       XATTR_CREATE = 1, /* set value, fail if attr already exists.  */
       ^
    /home/snoonan/Development/qemu/qemu/rules.mak:25: recipe for target 'fsdev/virtfs-proxy-helper.o' failed

Moving the include around resolves it.

Change-Id: I8242070c18a511e62877d57564a7ad754a8f14c8
Signed-off-by: Steven Noonan <snoonan@amazon.com>
Cc: Anthony Liguori <aliguori@amazon.com>
---

diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index b8da77d..7659b93 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -19,7 +19,6 @@ typedef unsigned long long __u64;
 #include <sys/resource.h>
 #include <getopt.h>
 #include <syslog.h>
-#include <sys/capability.h>
 #include <sys/fsuid.h>
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
@@ -30,6 +29,7 @@ typedef unsigned long long __u64;
 #include "qemu-common.h"
 #include "qemu/sockets.h"
 #include "qemu/xattr.h"
+#include <sys/capability.h>
 #include "virtio-9p-marshal.h"
 #include "hw/9pfs/virtio-9p-proxy.h"
 #include "fsdev/virtio-9p-marshal.h"