cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch removed, inluded upstream
Signed-off-by: Cristian Iorga <cristian.io...@intel.com> --- meta/recipes-devtools/qemu/qemu.inc | 1 - ..._mutex_lock_iothread-fix-race-condition-a.patch | 45 ---------------------- .../qemu/{qemu_2.4.0.bb => qemu_2.4.1.bb} | 4 +- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch rename meta/recipes-devtools/qemu/{qemu_2.4.0.bb => qemu_2.4.1.bb} (85%) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index abbace8..a2b08ae 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -21,7 +21,6 @@ SRC_URI = "\ file://wacom.patch \ file://add-ptest-in-makefile.patch \ file://run-ptest \ - file://cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch \ " SRC_URI_append_class-native = "\ diff --git a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch b/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch deleted file mode 100644 index 45dffab..0000000 --- a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status: Submitted - -From f354b9333408d411854af058cc44cceda60b4473 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.li...@linux.intel.com> -Date: Thu, 3 Sep 2015 14:07:34 -0500 -Subject: [PATCH] cpus.c: qemu_mutex_lock_iothread fix race condition at cpu - thread init -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When QEMU starts the RCU thread executes qemu_mutex_lock_thread -causing error "qemu:qemu_cpu_kick_thread: No such process" and exits. - -This isn't occur frequently but in glibc the thread id can exist and -this not guarantee that the thread is on active/running state. If is -inserted a sleep(1) after newthread assignment [1] the issue appears. - -So not make assumption that thread exist if first_cpu->thread is set -then change the validation of cpu to created that is set into cpu -threads (kvm, tcg, dummy). - -[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=nptl/pthread_create.c;h=d10f4ea8004e1d8f3a268b95cc0f8d93b8d89867;hb=HEAD#l621 - -Signed-off-by: Aníbal Limón <anibal.li...@linux.intel.com> ---- - cpus.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpus.c b/cpus.c -index 7e4786e..05e5400 100644 ---- a/cpus.c -+++ b/cpus.c -@@ -1171,7 +1171,7 @@ void qemu_mutex_lock_iothread(void) - * TCG code execution. - */ - if (!tcg_enabled() || qemu_in_vcpu_thread() || -- !first_cpu || !first_cpu->thread) { -+ !first_cpu || !first_cpu->created) { - qemu_mutex_lock(&qemu_global_mutex); - atomic_dec(&iothread_requesting_mutex); - } else { --- -1.9.1 - diff --git a/meta/recipes-devtools/qemu/qemu_2.4.0.bb b/meta/recipes-devtools/qemu/qemu_2.4.1.bb similarity index 85% rename from meta/recipes-devtools/qemu/qemu_2.4.0.bb rename to meta/recipes-devtools/qemu/qemu_2.4.1.bb index 1505b80..1f39cb5 100644 --- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.4.1.bb @@ -12,8 +12,8 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ file://no-valgrind.patch \ " SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" -SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" -SRC_URI[sha256sum] = "72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620" +SRC_URI[md5sum] = "a895e93ec1dafc34bc64ed676f0d55a6" +SRC_URI[sha256sum] = "e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177" COMPATIBLE_HOST_class-target_mips64 = "null" -- 2.5.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core