[packages/qemu.git] / qemu-xattr.patch

Workaround <linux/xattr.h> vs <sys/xattr.h> defines conflict:
When including both, the latter must be included first.
Move "qemu-xattr.h" (which includes <sys/xattr.h> to the front,
before <sys/capability.h> (which includes <linux/xattr.h>.

--- qemu-1.7.1/fsdev/virtfs-proxy-helper.c.orig	2014-03-25 15:01:10.000000000 +0100
+++ qemu-1.7.1/fsdev/virtfs-proxy-helper.c	2014-04-03 02:55:41.115547990 +0200
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/xattr.h"
 #include <sys/resource.h>
 #include <getopt.h>
 #include <syslog.h>
@@ -23,7 +24,6 @@
 #endif
 #include "qemu-common.h"
 #include "qemu/sockets.h"
-#include "qemu/xattr.h"
 #include "9p-iov-marshal.h"
 #include "hw/9pfs/9p-proxy.h"
 #include "fsdev/9p-iov-marshal.h"
Commit	Line	Data
	1	Workaround <linux/xattr.h> vs <sys/xattr.h> defines conflict:
	2	When including both, the latter must be included first.
	3	Move "qemu-xattr.h" (which includes <sys/xattr.h> to the front,
	4	before <sys/capability.h> (which includes <linux/xattr.h>.
	5
	6	--- qemu-1.7.1/fsdev/virtfs-proxy-helper.c.orig 2014-03-25 15:01:10.000000000 +0100
	7	+++ qemu-1.7.1/fsdev/virtfs-proxy-helper.c 2014-04-03 02:55:41.115547990 +0200
	8	@@ -10,6 +10,7 @@
	9	*/
	10
	11	#include "qemu/osdep.h"
	12	+#include "qemu/xattr.h"
	13	#include <sys/resource.h>
	14	#include <getopt.h>
	15	#include <syslog.h>
	16	@@ -23,7 +24,6 @@
	17	#endif
	18	#include "qemu-common.h"
	19	#include "qemu/sockets.h"
	20	-#include "qemu/xattr.h"
	21	#include "9p-iov-marshal.h"
	22	#include "hw/9pfs/9p-proxy.h"
	23	#include "fsdev/9p-iov-marshal.h"
	24