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:
authorMartin Jansa <martin.jansa@gmail.com>2018-06-01 10:29:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-07 08:52:55 +0100
commitf8ec8e89bbe913dd8afcf5136efc64a1d2793a8f (patch)
tree899b05ba8ceb6a5655c76a5ef095b95c20a87ed0 /meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
parent1c7ad49bfd3e60c44281a8f49d69f4b96c359703 (diff)
downloadpoky-f8ec8e89bbe913dd8afcf5136efc64a1d2793a8f.tar.gz
qemu: upgrade to 2.12.0
* drop patches which are now included upstream * revert "linux-user: fix mmap/munmap/mprotect/mremap/shma" which is causing 0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch to stop working and qemu-i386 hanging during gobject-introspection in webkitgtk when building for qemux86 with musl (From OE-Core rev: e9d6e09bb51a857ce248f45124548d338a350ba1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.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-.patch73
1 files changed, 73 insertions, 0 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
new file mode 100644
index 0000000000..8a9141acde
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
@@ -0,0 +1,73 @@
1From edc8dba74c7a4a2121d76c982be0074183bf080a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Wed, 12 Aug 2015 15:11:30 -0500
4Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails.
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Add custom_debug.h with function for print backtrace information.
10When pthread_kill fails in qemu_cpu_kick_thread display backtrace and
11current cpu information.
12
13Upstream-Status: Inappropriate
14Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
15---
16 cpus.c | 5 +++++
17 custom_debug.h | 24 ++++++++++++++++++++++++
18 2 files changed, 29 insertions(+)
19 create mode 100644 custom_debug.h
20
21diff --git a/cpus.c b/cpus.c
22index 38eba8bff3..b84a60a4f3 100644
23--- a/cpus.c
24+++ b/cpus.c
25@@ -1690,6 +1690,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
26 return NULL;
27 }
28
29+#include "custom_debug.h"
30+
31 static void qemu_cpu_kick_thread(CPUState *cpu)
32 {
33 #ifndef _WIN32
34@@ -1702,6 +1704,9 @@ static void qemu_cpu_kick_thread(CPUState *cpu)
35 err = pthread_kill(cpu->thread->thread, SIG_IPI);
36 if (err) {
37 fprintf(stderr, "qemu:%s: %s", __func__, strerror(err));
38+ fprintf(stderr, "CPU #%d:\n", cpu->cpu_index);
39+ cpu_dump_state(cpu, stderr, fprintf, 0);
40+ backtrace_print();
41 exit(1);
42 }
43 #else /* _WIN32 */
44diff --git a/custom_debug.h b/custom_debug.h
45new file mode 100644
46index 0000000000..f029e45547
47--- /dev/null
48+++ b/custom_debug.h
49@@ -0,0 +1,24 @@
50+#include <execinfo.h>
51+#include <stdio.h>
52+#define BACKTRACE_MAX 128
53+static void backtrace_print(void)
54+{
55+ int nfuncs = 0;
56+ void *buf[BACKTRACE_MAX];
57+ char **symbols;
58+ int i;
59+
60+ nfuncs = backtrace(buf, BACKTRACE_MAX);
61+
62+ symbols = backtrace_symbols(buf, nfuncs);
63+ if (symbols == NULL) {
64+ fprintf(stderr, "backtrace_print failed to get symbols");
65+ return;
66+ }
67+
68+ fprintf(stderr, "Backtrace ...\n");
69+ for (i = 0; i < nfuncs; i++)
70+ fprintf(stderr, "%s\n", symbols[i]);
71+
72+ free(symbols);
73+}