summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-16 17:40:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-25 16:38:12 +0000
commit7c62b36a34f3b1491bf3df6a559bc0a74c74c173 (patch)
tree486fc3da0426a673b3778495bbe59a6441f007aa /meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch
parentfcb1b5a4d76f18d5cc1a0327ce41f6c188da6618 (diff)
downloadpoky-7c62b36a34f3b1491bf3df6a559bc0a74c74c173.tar.gz
qemu: Upgrade 0.13.0 -> 0.14.0
* ppc-hack patch is dropped. * Other patches which were direct backports or has been merged upstream in 0.14.0 are also dropped (From OE-Core rev: 97fbdfdbfb15de325fd148bcecc9187d0f778db5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch
new file mode 100644
index 0000000000..8df60e85e7
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch
@@ -0,0 +1,16 @@
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
5Index: qemu-0.14.0/ui/sdl.c
6===================================================================
7--- qemu-0.14.0.orig/ui/sdl.c
8+++ qemu-0.14.0/ui/sdl.c
9@@ -863,6 +863,7 @@ void sdl_display_init(DisplayState *ds,
10 vi = SDL_GetVideoInfo();
11 host_format = *(vi->vfmt);
12
13+ bzero(&info, sizeof(info));
14 SDL_GetWMInfo(&info);
15 if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display)
16 opengl_exec_set_parent_window(info.info.x11.display,