diff options
Diffstat (limited to 'meta/recipes-devtools/qemu')
3 files changed, 0 insertions, 115 deletions
diff --git a/meta/recipes-devtools/qemu/files/3f08ffb4a4741d147634761dc053ed386243a0de.patch b/meta/recipes-devtools/qemu/files/3f08ffb4a4741d147634761dc053ed386243a0de.patch deleted file mode 100644 index 4390b943b9..0000000000 --- a/meta/recipes-devtools/qemu/files/3f08ffb4a4741d147634761dc053ed386243a0de.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | [Appears to fix the random segfaults we were seeing in a variety of architectures: | ||
4 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=4216 ] | ||
5 | |||
6 | |||
7 | From: Yeongkyoon Lee <yeongkyoon.lee@samsung.com> | ||
8 | Date: Fri, 22 Mar 2013 12:50:17 +0000 (+0900) | ||
9 | Subject: tcg: Fix occasional TCG broken problem when ldst optimization enabled | ||
10 | X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=52ae646d4a3ebdcdcc973492c6a56f2c49b6578f;hp=3f08ffb4a4741d147634761dc053ed386243a0de | ||
11 | |||
12 | tcg: Fix occasional TCG broken problem when ldst optimization enabled | ||
13 | |||
14 | is_tcg_gen_code() checks the upper limit of TCG generated code range wrong, so | ||
15 | that TCG could get broken occasionally only when CONFIG_QEMU_LDST_OPTIMIZATION | ||
16 | enabled. The reason is code_gen_buffer_max_size does not cover the upper range | ||
17 | up to (TCG_MAX_OP_SIZE * OPC_BUF_SIZE), thus code_gen_buffer_max_size should be | ||
18 | modified to code_gen_buffer_size. | ||
19 | |||
20 | CC: qemu-stable@nongnu.org | ||
21 | Signed-off-by: Yeongkyoon Lee <yeongkyoon.lee@samsung.com> | ||
22 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
23 | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> | ||
24 | --- | ||
25 | |||
26 | Index: qemu-1.4.0/translate-all.c | ||
27 | =================================================================== | ||
28 | --- qemu-1.4.0.orig/translate-all.c 2013-04-09 10:58:19.000000000 +0000 | ||
29 | +++ qemu-1.4.0/translate-all.c 2013-04-09 10:58:34.783203406 +0000 | ||
30 | @@ -1310,10 +1310,10 @@ | ||
31 | /* check whether the given addr is in TCG generated code buffer or not */ | ||
32 | bool is_tcg_gen_code(uintptr_t tc_ptr) | ||
33 | { | ||
34 | - /* This can be called during code generation, code_gen_buffer_max_size | ||
35 | + /* This can be called during code generation, code_gen_buffer_size | ||
36 | is used instead of code_gen_ptr for upper boundary checking */ | ||
37 | return (tc_ptr >= (uintptr_t)code_gen_buffer && | ||
38 | - tc_ptr < (uintptr_t)(code_gen_buffer + code_gen_buffer_max_size)); | ||
39 | + tc_ptr < (uintptr_t)(code_gen_buffer + code_gen_buffer_size)); | ||
40 | } | ||
41 | #endif | ||
42 | |||
diff --git a/meta/recipes-devtools/qemu/files/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/files/enable-i386-linux-user.patch deleted file mode 100644 index bb0d6a3848..0000000000 --- a/meta/recipes-devtools/qemu/files/enable-i386-linux-user.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | Enable i386-linux-user | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Index: qemu-0.14.0/Makefile.target | ||
8 | =================================================================== | ||
9 | --- qemu-0.14.0.orig/Makefile.target | ||
10 | +++ qemu-0.14.0/Makefile.target | ||
11 | @@ -78,8 +78,13 @@ ifeq ($(TARGET_BASE_ARCH), i386) | ||
12 | libobj-y += cpuid.o | ||
13 | endif | ||
14 | libobj-$(CONFIG_NEED_MMU) += mmu.o | ||
15 | +ifndef CONFIG_LINUX_USER | ||
16 | libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o | ||
17 | libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o | ||
18 | +else | ||
19 | +libobj-$(TARGET_I386) += dummygl.o | ||
20 | +libobj-$(TARGET_X86_64) += dummygl.o | ||
21 | +endif #CONFIG_LINUX_USER | ||
22 | libobj-$(TARGET_ARM) += dummygl.o | ||
23 | libobj-$(TARGET_MIPS) += dummygl.o | ||
24 | libobj-$(TARGET_PPC) += dummygl.o | ||
25 | Index: qemu-0.14.0/target-i386/dummygl.c | ||
26 | =================================================================== | ||
27 | --- /dev/null | ||
28 | +++ qemu-0.14.0/target-i386/dummygl.c | ||
29 | @@ -0,0 +1,26 @@ | ||
30 | +#include <string.h> | ||
31 | +#include <stdlib.h> | ||
32 | +#include <assert.h> | ||
33 | +#include <stdint.h> | ||
34 | +#include <X11/Xlib.h> | ||
35 | +#include <X11/Xutil.h> | ||
36 | + | ||
37 | +void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window) | ||
38 | +{ | ||
39 | + | ||
40 | +} | ||
41 | + | ||
42 | +void opengl_process_enable(void) | ||
43 | +{ | ||
44 | + | ||
45 | +} | ||
46 | + | ||
47 | + | ||
48 | +void mem_opengl(uint64_t ptr) | ||
49 | +{ | ||
50 | + | ||
51 | +} | ||
52 | + | ||
53 | +void helper_opengl(void) | ||
54 | +{ | ||
55 | +} | ||
diff --git a/meta/recipes-devtools/qemu/files/init-info.patch b/meta/recipes-devtools/qemu/files/init-info.patch deleted file mode 100644 index 2250444a2b..0000000000 --- a/meta/recipes-devtools/qemu/files/init-info.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | # This is a workaround to the crashes seen on Ubuntu. Setting info to zero | ||
2 | # makes info.info.x11.display zero and avoids the calls to | ||
3 | # opengl_exec_set_parent_window, one of which is crashing. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: qemu-0.14.0/ui/sdl.c | ||
8 | =================================================================== | ||
9 | --- qemu-0.14.0.orig/ui/sdl.c | ||
10 | +++ qemu-0.14.0/ui/sdl.c | ||
11 | @@ -863,6 +863,7 @@ void sdl_display_init(DisplayState *ds, | ||
12 | vi = SDL_GetVideoInfo(); | ||
13 | host_format = *(vi->vfmt); | ||
14 | |||
15 | + bzero(&info, sizeof(info)); | ||
16 | SDL_GetWMInfo(&info); | ||
17 | if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display) | ||
18 | opengl_exec_set_parent_window(info.info.x11.display, | ||