From 7c62b36a34f3b1491bf3df6a559bc0a74c74c173 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 16 Mar 2011 17:40:36 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch (limited to 'meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch') 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 @@ +# This is a workaround to the crashes seen on Ubuntu. Setting info to zero +# makes info.info.x11.display zero and avoids the calls to +# opengl_exec_set_parent_window, one of which is crashing. + +Index: qemu-0.14.0/ui/sdl.c +=================================================================== +--- qemu-0.14.0.orig/ui/sdl.c ++++ qemu-0.14.0/ui/sdl.c +@@ -863,6 +863,7 @@ void sdl_display_init(DisplayState *ds, + vi = SDL_GetVideoInfo(); + host_format = *(vi->vfmt); + ++ bzero(&info, sizeof(info)); + SDL_GetWMInfo(&info); + if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display) + opengl_exec_set_parent_window(info.info.x11.display, -- cgit v1.2.3-54-g00ecf