- updated to 2.12.1

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

diff --git a/qemu-xattr.patch b/qemu-xattr.patch
index 4d89cb2f453f1d07775423f85cf237fae838d1ff..8820334ad8dc0e9d25f811d8ccecccf850af5f39 100644 (file)
--- a/qemu-xattr.patch
+++ b/qemu-xattr.patch
@@ -1,23 +1,19 @@
-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
+diff -urp qemu-2.6.1.orig/fsdev/virtfs-proxy-helper.c qemu-2.6.1/fsdev/virtfs-proxy-helper.c
+--- qemu-2.6.1.orig/fsdev/virtfs-proxy-helper.c        2016-08-22 12:47:04.270554000 +0000
++++ qemu-2.6.1/fsdev/virtfs-proxy-helper.c     2016-08-22 12:52:40.042554000 +0000
 @@ -9,6 +9,7 @@
   * the COPYING file in the top-level directory.
   */
  
 +#include "qemu/xattr.h"
+ #include "qemu/osdep.h"
  #include <sys/resource.h>
  #include <getopt.h>
- #include <syslog.h>
-@@ -22,7 +23,6 @@
+@@ -23,7 +24,6 @@
  #endif
  #include "qemu-common.h"
  #include "qemu/sockets.h"
 -#include "qemu/xattr.h"
- #include "virtio-9p-marshal.h"
- #include "hw/9pfs/virtio-9p-proxy.h"
- #include "fsdev/virtio-9p-marshal.h"
+ #include "9p-iov-marshal.h"
+ #include "hw/9pfs/9p-proxy.h"
+ #include "fsdev/9p-iov-marshal.h"