From 576e136d9d6d473ce6a7ffc7abadc75e1a218418 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Sat, 15 Jan 2011 16:32:15 +0800 Subject: qemu: Upgrade from 0.12.4 to 0.13.0 Patch status: -- Removed -- arm-cp15-fix.patch arm_timer-fix-oneshot-mode.patch arm_timer-reload-timer-when-enabled.patch cursor-shadow-fix.patch -- They are already in upstream or some new changes make them useless. -- Added -- parallel_make.patch: Fix "make -j(>=6)" failure wacom-tablet-fix.patch: Fix seg fault of usb tablet. port92_fix.patch: Fix boot failure on ppc due to port 0x92 conflict. Signed-off-by: Zhai Edwin --- .../qemu/qemu-0.13.0/wacom-tablet-fix.patch | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu-0.13.0/wacom-tablet-fix.patch (limited to 'meta/recipes-devtools/qemu/qemu-0.13.0/wacom-tablet-fix.patch') diff --git a/meta/recipes-devtools/qemu/qemu-0.13.0/wacom-tablet-fix.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/wacom-tablet-fix.patch new file mode 100644 index 0000000000..b8210db2b1 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-0.13.0/wacom-tablet-fix.patch @@ -0,0 +1,65 @@ +qemu 0.13.0 cause seg fault in qemu_remove_mouse_event_handler, this patch from +upstream can fix it. + +Should remove it in next upgrade if necessary. + +Signed-off-by: Zhai Edwin + +commit b2d4d8329963b13c5cebe5944dcc99f0e9d1b5c7 +Author: Gerd Hoffmann +Date: Fri Oct 8 12:30:14 2010 +0200 + + wacom tablet: activate event handlers. + + Add qemu_activate_mouse_event_handler() calls to the usb wavom tablet so + it actually receives events. Also make sure we only remove the handler + if we registered it before. + + Signed-off-by: Gerd Hoffmann + Signed-off-by: Anthony Liguori + +Index: qemu-0.13.0/hw/usb-wacom.c +=================================================================== +--- qemu-0.13.0.orig/hw/usb-wacom.c 2010-10-16 04:56:09.000000000 +0800 ++++ qemu-0.13.0/hw/usb-wacom.c 2011-01-18 16:58:44.000000000 +0800 +@@ -160,6 +160,7 @@ + if (!s->mouse_grabbed) { + s->eh_entry = qemu_add_mouse_event_handler(usb_mouse_event, s, 0, + "QEMU PenPartner tablet"); ++ qemu_activate_mouse_event_handler(s->eh_entry); + s->mouse_grabbed = 1; + } + +@@ -197,6 +198,7 @@ + if (!s->mouse_grabbed) { + s->eh_entry = qemu_add_mouse_event_handler(usb_wacom_event, s, 1, + "QEMU PenPartner tablet"); ++ qemu_activate_mouse_event_handler(s->eh_entry); + s->mouse_grabbed = 1; + } + +@@ -334,8 +336,10 @@ + ret = 0; + break; + case WACOM_SET_REPORT: +- qemu_remove_mouse_event_handler(s->eh_entry); +- s->mouse_grabbed = 0; ++ if (s->mouse_grabbed) { ++ qemu_remove_mouse_event_handler(s->eh_entry); ++ s->mouse_grabbed = 0; ++ } + s->mode = data[0]; + ret = 0; + break; +@@ -397,7 +401,10 @@ + { + USBWacomState *s = (USBWacomState *) dev; + +- qemu_remove_mouse_event_handler(s->eh_entry); ++ if (s->mouse_grabbed) { ++ qemu_remove_mouse_event_handler(s->eh_entry); ++ s->mouse_grabbed = 0; ++ } + } + + static int usb_wacom_initfn(USBDevice *dev) -- cgit v1.2.3-54-g00ecf