X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=qemu-xattr.patch;h=92e9498603b76ae9447c385a4be0b65c8bcdcd5c;hb=f799dc25f4dd72b2a62d6dae4f4a90158445a28a;hp=4d89cb2f453f1d07775423f85cf237fae838d1ff;hpb=924ae799761503024fdf4c468e9d5422e575822d;p=packages%2Fqemu.git

diff --git a/qemu-xattr.patch b/qemu-xattr.patch
index 4d89cb2..92e9498 100644
--- 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
-@@ -9,6 +9,7 @@
-  * the COPYING file in the top-level directory.
+diff -ur qemu-7.0.0.orig/fsdev/virtfs-proxy-helper.c qemu-7.0.0/fsdev/virtfs-proxy-helper.c
+--- qemu-7.0.0.orig/fsdev/virtfs-proxy-helper.c	2022-06-03 00:26:58.520973498 +0200
++++ qemu-7.0.0/fsdev/virtfs-proxy-helper.c	2022-06-03 00:27:13.052002997 +0200
+@@ -10,6 +10,7 @@
   */
  
+ #include "qemu/osdep.h"
 +#include "qemu/xattr.h"
  #include <sys/resource.h>
  #include <getopt.h>
  #include <syslog.h>
-@@ -22,7 +23,6 @@
- #endif
+@@ -23,7 +24,6 @@
+ #include <cap-ng.h>
  #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"