- updated to 6.2.0

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

diff --git a/qemu-xattr.patch b/qemu-xattr.patch
index c137485ed33f6a0e027a3bcc69ebad5a5070b021..f64e77b6ff34a4b34562ec40873b0dc096780bc4 100644 (file)
--- a/qemu-xattr.patch
+++ b/qemu-xattr.patch
@@ -1,10 +1,6 @@
-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 -ur qemu-6.2.0.orig/fsdev/virtfs-proxy-helper.c qemu-6.2.0/fsdev/virtfs-proxy-helper.c
+--- qemu-6.2.0.orig/fsdev/virtfs-proxy-helper.c        2022-01-23 13:45:27.232229307 +0100
++++ qemu-6.2.0/fsdev/virtfs-proxy-helper.c     2022-01-23 13:46:12.429320664 +0100
 @@ -10,6 +10,7 @@
   */
  
@@ -14,11 +10,10 @@ before <sys/capability.h> (which includes <linux/xattr.h>.
  #include <getopt.h>
  #include <syslog.h>
 @@ -23,7 +24,6 @@
- #endif
+ #include <cap-ng.h>
  #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"
-