[Tizen-submit] 20885: Changes to Tizen:Mobile/qemu

noreply at tizen.org noreply at tizen.org
Fri Feb 7 09:52:46 GMT 2014


Hi,
Stephane Desneux have made the following changes to qemu in project Tizen:Mobile. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #20885

  submit:       Tizen:Mobile:build/qemu(cleanup) -> Tizen:Mobile


Message:
Submitter: Stephane Desneux <stephane.desneux at open.eurogiciel.org>
Comments: fix compile error
Git project: platform/upstream/qemu
Tag: submit/tizen/20140207.095509
Commit: 15382d5fa1ea8d6e9e5441cead3494c82207c063 virtfs-proxy-helper.c: fix compile error

State:   new        2014-02-07T09:54:39 tizenrobot
Comment: <no comment>
changes files:
--------------

new:
----
  0045-virtfs-proxy-helper.c-fix-compile-error.patch

spec files:
-----------
--- qemu.spec
+++ qemu.spec
@@ -1,5 +1,5 @@
 Name:           qemu
-VCS:            platform/upstream/qemu#7ccdb8880dff22ca0bd4516d9973c55397c08e22
+VCS:            platform/upstream/qemu#15382d5fa1ea8d6e9e5441cead3494c82207c063
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
@@ -57,6 +57,7 @@
 Patch41:        0042-Fix-size-used-for-memset-in-alloc_output_file.patch
 Patch42:        0043-Avoid-strict-aliasing-warning-for-gcc-4.3.patch
 Patch43:        0044-enable-32-bit-qemu-for-Tizen.patch
+Patch44:        0045-virtfs-proxy-helper.c-fix-compile-error.patch
 BuildRequires:  bison
 BuildRequires:  curl-devel
 BuildRequires:  e2fsprogs-devel
@@ -223,6 +224,8 @@
 %patch42 -p1
 # 0044-enable-32-bit-qemu-for-Tizen.patch
 %patch43 -p1
+# 0045-virtfs-proxy-helper.c-fix-compile-error.patch
+%patch44 -p1
 
 %build
 # build QEMU

other changes:
--------------

++++++ 0045-virtfs-proxy-helper.c-fix-compile-error.patch (new)
--- 0045-virtfs-proxy-helper.c-fix-compile-error.patch
+++ 0045-virtfs-proxy-helper.c-fix-compile-error.patch
@@ -0,0 +1,42 @@
+From: Steven Noonan <snoonan at amazon.com>
+Date: Thu, 9 Jan 2014 13:55:07 -0800
+Subject: virtfs-proxy-helper.c: fix compile error
+
+This is caused by a linux/xattr.h and sys/xattr.h incompatibility:
+
+    In file included from /home/snoonan/Development/qemu/include/qemu/xattr.h:27:0,
+		     from fsdev/virtfs-proxy-helper.c:25:
+    /usr/include/sys/xattr.h:31:3: error: expected identifier before numeric constant
+       XATTR_CREATE = 1, /* set value, fail if attr already exists.  */
+       ^
+    /home/snoonan/Development/qemu/qemu/rules.mak:25: recipe for target 'fsdev/virtfs-proxy-helper.o' failed
+
+Moving the include around resolves it.
+
+Change-Id: I8242070c18a511e62877d57564a7ad754a8f14c8
+Signed-off-by: Steven Noonan <snoonan at amazon.com>
+Cc: Anthony Liguori <aliguori at amazon.com>
+---
+ fsdev/virtfs-proxy-helper.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
+index b8da77d..7659b93 100644
+--- a/fsdev/virtfs-proxy-helper.c
++++ b/fsdev/virtfs-proxy-helper.c
+@@ -19,7 +19,6 @@ typedef unsigned long long __u64;
+ #include <sys/resource.h>
+ #include <getopt.h>
+ #include <syslog.h>
+-#include <sys/capability.h>
+ #include <sys/fsuid.h>
+ #include <sys/vfs.h>
+ #include <sys/ioctl.h>
+@@ -30,6 +29,7 @@ typedef unsigned long long __u64;
+ #include "qemu-common.h"
+ #include "qemu/sockets.h"
+ #include "qemu/xattr.h"
++#include <sys/capability.h>
+ #include "virtio-9p-marshal.h"
+ #include "hw/9pfs/virtio-9p-proxy.h"
+ #include "fsdev/virtio-9p-marshal.h"


More information about the Tizen-submit mailing list