Merge lp:~rsalveti/ubuntu/maverick/qemu-kvm/fix-610742 into lp:ubuntu/maverick/qemu-kvm

[Ricardo Salveti]

debian/patches/linux-user-do-not-warn-for-missing-pselect6.patch:
 Avoid showing unsupported syscall: 335 for pselect. This was fixed for
 lucid with the pselect patch, but upstream decided not to apply it as it
 it can't guaranty the atomicity for all distros. This patch is backported
 from upstream, as they decided to just remove the warn for it (LP: #610742)

[Serge Hallyn (serge-hallyn)]

Thanks, this looks good. It'll have a very short life-time, but
sounds worth having in the meantime.

Note that I don't have upload rights, so all I can do is say "I
approve" fwiw.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-26 15:04:23 +0000
+++ debian/changelog	2010-07-28 07:07:43 +0000
@@ -1,3 +1,13 @@
+qemu-kvm (0.12.4+noroms-0ubuntu7) maverick; urgency=low
+
+  * debian/patches/linux-user-do-not-warn-for-missing-pselect6.patch:
+    Avoid showing unsupported syscall: 335 for pselect. This was fixed for
+    lucid with the pselect patch, but upstream decided not to apply it as it
+    it can't guaranty the atomicity for all distros. This patch is backported
+    from upstream, as they decided to just remove the warn for it (LP: #610742) 
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Wed, 28 Jul 2010 02:56:04 -0300
+
 qemu-kvm (0.12.4+noroms-0ubuntu6) maverick; urgency=low
 
   * New patch, arm-ignore-writes-of-perf-reg-cp15-with-crm-12, on ARMv7,
 
=== added file 'debian/patches/linux-user-do-not-warn-for-missing-pselect6.patch'
--- debian/patches/linux-user-do-not-warn-for-missing-pselect6.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/linux-user-do-not-warn-for-missing-pselect6.patch	2010-07-28 07:07:43 +0000
@@ -0,0 +1,64 @@
+From 9e42382fc14b999126f8cabb32761eb98153fd1b Mon Sep 17 00:00:00 2001
+From: Riku Voipio <[e-mail]>
+Date: Fri, 7 May 2010 12:28:05 +0000
+Subject: [PATCH] linux-user: do not warn for missing pselect6
+
+Libc will fallback gracefully if pselect6 is not available. Thus put
+pselect6 to nowarn until the atomicity issues of the original pselect6
+patch are dealt with.
+
+Signed-off-by: Riku Voipio <[e-mail]>
+Cc: Michael Casadevall <[e-mail]>
+Signed-off-by: Aurelien Jarno <[e-mail]>
+---
+ linux-user/syscall.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index bca8f70..8222cb9 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -5268,6 +5268,10 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+         }
+         break;
+ #endif
++#ifdef TARGET_NR_pselect6
++    case TARGET_NR_pselect6:
++	    goto unimplemented_nowarn;
++#endif
+     case TARGET_NR_symlink:
+         {
+             void *p2;
+-- 
+1.7.1
+
+From 7270547fe8d0d2c1d13fee592042208d4a82f73a Mon Sep 17 00:00:00 2001
+From: Michael Casadevall <[e-mail]>
+Date: Fri, 26 Mar 2010 15:25:10 +0000
+Subject: [PATCH] linux-user: Add the syscall id for pselect6 on ARM
+
+As this is now supported in newer linux kernels.
+
+Signed-off-by: Michael Casadevall <[e-mail]>
+Signed-off-by: Riku Voipio <[e-mail]>
+Signed-off-by: Aurelien Jarno <[e-mail]>
+---
+ linux-user/arm/syscall_nr.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/linux-user/arm/syscall_nr.h b/linux-user/arm/syscall_nr.h
+index b1db341..79a216a 100644
+--- a/linux-user/arm/syscall_nr.h
++++ b/linux-user/arm/syscall_nr.h
+@@ -338,7 +338,7 @@
+ #define TARGET_NR_readlinkat			(332)
+ #define TARGET_NR_fchmodat			(333)
+ #define TARGET_NR_faccessat			(334)
+-					/* 335 for pselect6 */
++#define TARGET_NR_pselect6			(335)
+ 					/* 336 for ppoll */
+ #define TARGET_NR_unshare			(337)
+ #define TARGET_NR_set_robust_list		(338)
+-- 
+1.7.1
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-07-26 15:04:23 +0000
+++ debian/patches/series	2010-07-28 07:07:43 +0000
@@ -5,3 +5,4 @@
 scm-rights-fd.patch
 fix-multiboot-compilation.patch
 Detect-and-use-GCC-atomic-builtins-for-locking.patch
+linux-user-do-not-warn-for-missing-pselect6.patch