From 8c42510e06cdc8364f5e74b31b1d75ca342ab269 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 3 Feb 2008 00:03:07 +0000
Subject: qemu: Fix writev syscall null value handling, fixes glibc LC_CTYPE
 errors during locale generation

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3661 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/qemu/qemu-0.9.1/writev_fix.patch | 17 +++++++++++++++++
 meta/packages/qemu/qemu_0.9.1.bb               |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/qemu/qemu-0.9.1/writev_fix.patch

(limited to 'meta/packages')

diff --git a/meta/packages/qemu/qemu-0.9.1/writev_fix.patch b/meta/packages/qemu/qemu-0.9.1/writev_fix.patch
new file mode 100644
index 000000000..e0ed4af97
--- /dev/null
+++ b/meta/packages/qemu/qemu-0.9.1/writev_fix.patch
@@ -0,0 +1,17 @@
+---
+ linux-user/syscall.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-0.9.1/linux-user/syscall.c
+===================================================================
+--- qemu-0.9.1.orig/linux-user/syscall.c	2008-02-03 00:00:00.000000000 +0000
++++ qemu-0.9.1/linux-user/syscall.c	2008-02-03 00:00:38.000000000 +0000
+@@ -1048,7 +1048,7 @@ static abi_long lock_iovec(int type, str
+         base = tswapl(target_vec[i].iov_base);
+         vec[i].iov_len = tswapl(target_vec[i].iov_len);
+         vec[i].iov_base = lock_user(type, base, vec[i].iov_len, copy);
+-	if (!vec[i].iov_base) 
++	if (!vec[i].iov_base && vec[i].iov_len) 
+             goto fail;
+     }
+     unlock_user (target_vec, target_addr, 0);
diff --git a/meta/packages/qemu/qemu_0.9.1.bb b/meta/packages/qemu/qemu_0.9.1.bb
index 59aa55bbe..1a34d4d73 100644
--- a/meta/packages/qemu/qemu_0.9.1.bb
+++ b/meta/packages/qemu/qemu_0.9.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
-PR = "r4"
+PR = "r5"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"
@@ -31,6 +31,7 @@ SRC_URI = "\
     file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \
     file://workaround_bad_futex_headers.patch;patch=1 \
     file://fix_segfault.patch;patch=1 \
+    file://writev_fix.patch;patch=1 \
     file://configure_symlinkpath_fix.patch;patch=1 \
     file://disable-error-in-configure.patch;patch=1"
 
-- 
cgit v1.2.3