[oe-commits] =?UTF-8?Q?An=C3=ADbal=20Lim=C3=B3n=20?=: qemu-native: Use g_poll instead of ppoll in qemu-timer

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: f3696ce44b67255cc1ba0bd050a5a5fd4b692039
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f3696ce44b67255cc1ba0bd050a5a5fd4b692039

Author: Aníbal Limón <anibal.limon at linux.intel.com>
Date:   Fri Aug 21 15:46:31 2015 -0500

qemu-native: Use g_poll instead of ppoll in qemu-timer

We are experiencing random failures in QEMU when run Sanity tests
in the AB, possible related to high i/o load (nfs) in the production
setup that cause some locking/timeouts inside qemu tcg an devices.

I found that if the default poll method is changed this errors don't
appear.

This is NOT a final solution but may be a workaround.

[YOCTO #8141]

Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-devtools/qemu/qemu.inc                |  1 +
 ...c-Disable-CONFIG_PPOLL-use-g_poll-instead.patch | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 8c1e779..2a95d54 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,6 +26,7 @@ SRC_URI = "\
 SRC_URI_append_class-native = "\
     file://fix-libcap-header-issue-on-some-distro.patch \
     file://cpus.c-qemu_cpu_kick_thread_debugging.patch \
+    file://0001-qemu-timer.c-Disable-CONFIG_PPOLL-use-g_poll-instead.patch \
     "
 
 EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror  --disable-bluez --disable-libiscsi --with-system-pixman --extra-cflags='${CFLAGS}'"
diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-timer.c-Disable-CONFIG_PPOLL-use-g_poll-instead.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-timer.c-Disable-CONFIG_PPOLL-use-g_poll-instead.patch
new file mode 100644
index 0000000..6eb333b
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-timer.c-Disable-CONFIG_PPOLL-use-g_poll-instead.patch
@@ -0,0 +1,28 @@
+From 705d296470479d25e8ca1a73b11552a6a85f7b60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon at linux.intel.com>
+Date: Fri, 21 Aug 2015 15:37:30 -0500
+Subject: [PATCH] qemu-timer.c: Disable CONFIG_PPOLL use g_poll instead
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
+---
+ qemu-timer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qemu-timer.c b/qemu-timer.c
+index 2463fe6..e92f3f1 100644
+--- a/qemu-timer.c
++++ b/qemu-timer.c
+@@ -29,6 +29,7 @@
+ #include <pthread.h>
+ #endif
+ 
++#undef CONFIG_PPOLL
+ #ifdef CONFIG_PPOLL
+ #include <poll.h>
+ #endif
+-- 
+1.9.1
+