summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
diff options
context:
space:
mode:
authorBartosz Golaszewski <bgolaszewski@baylibre.com>2019-07-28 13:06:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-08 22:52:28 +0100
commit0f7e6681a825105150a367d94b73f36040a2b9c9 (patch)
tree568b53357228db11cf2a20c29ae7eb815afe2848 /meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
parent4e6a44598fe877ac4942fbdc8f0c576b234de6cc (diff)
downloadpoky-0f7e6681a825105150a367d94b73f36040a2b9c9.tar.gz
qemu: add a patch fixing the native build on newer kernels
The build fails on qemu-native if we're using kernels after commit 0768e17073dc527ccd18ed5f96ce85f9985e9115. This adds an upstream patch that fixes the issue. (From OE-Core rev: fac2d3846dadfda256e94500bdf33f546a8d1fb4) Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Refactoried for thud context] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch19
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
index 8a9141acde..03ec2c90e1 100644
--- a/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
+++ b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
@@ -18,11 +18,11 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
18 2 files changed, 29 insertions(+) 18 2 files changed, 29 insertions(+)
19 create mode 100644 custom_debug.h 19 create mode 100644 custom_debug.h
20 20
21diff --git a/cpus.c b/cpus.c 21Index: qemu-3.0.0/cpus.c
22index 38eba8bff3..b84a60a4f3 100644 22===================================================================
23--- a/cpus.c 23--- qemu-3.0.0.orig/cpus.c
24+++ b/cpus.c 24+++ qemu-3.0.0/cpus.c
25@@ -1690,6 +1690,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) 25@@ -1693,6 +1693,8 @@ static void *qemu_tcg_cpu_thread_fn(void
26 return NULL; 26 return NULL;
27 } 27 }
28 28
@@ -31,7 +31,7 @@ index 38eba8bff3..b84a60a4f3 100644
31 static void qemu_cpu_kick_thread(CPUState *cpu) 31 static void qemu_cpu_kick_thread(CPUState *cpu)
32 { 32 {
33 #ifndef _WIN32 33 #ifndef _WIN32
34@@ -1702,6 +1704,9 @@ static void qemu_cpu_kick_thread(CPUState *cpu) 34@@ -1705,6 +1707,9 @@ static void qemu_cpu_kick_thread(CPUStat
35 err = pthread_kill(cpu->thread->thread, SIG_IPI); 35 err = pthread_kill(cpu->thread->thread, SIG_IPI);
36 if (err) { 36 if (err) {
37 fprintf(stderr, "qemu:%s: %s", __func__, strerror(err)); 37 fprintf(stderr, "qemu:%s: %s", __func__, strerror(err));
@@ -41,11 +41,10 @@ index 38eba8bff3..b84a60a4f3 100644
41 exit(1); 41 exit(1);
42 } 42 }
43 #else /* _WIN32 */ 43 #else /* _WIN32 */
44diff --git a/custom_debug.h b/custom_debug.h 44Index: qemu-3.0.0/custom_debug.h
45new file mode 100644 45===================================================================
46index 0000000000..f029e45547
47--- /dev/null 46--- /dev/null
48+++ b/custom_debug.h 47+++ qemu-3.0.0/custom_debug.h
49@@ -0,0 +1,24 @@ 48@@ -0,0 +1,24 @@
50+#include <execinfo.h> 49+#include <execinfo.h>
51+#include <stdio.h> 50+#include <stdio.h>