--- 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.
+@@ -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 @@
+@@ -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"
+