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.12.4/cursor-shadow-fix.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch (limited to 'meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch') diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch deleted file mode 100644 index 6600c4303..000000000 --- a/meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix the mouse shadow in qemu - -the root cause is that the qemu cursor array is hardcoded to 256 bytes, while the sato use cursor of the size 64*64=4096, thus lead buffer overflow and abnormal mouse. - -This issue has been fixed in upstream starting from v0.13.0-rc0. v0.12.5 still has this issue. So when qemu is upgraded to 0.13.0 or above, this patch can be safely removed. - -Signed-off-by: Yu Ke - -diff --git a/sdl.c b/sdl.c -index 7912c91..2f33cd2 100644 ---- a/sdl.c -+++ b/sdl.c -@@ -775,12 +775,12 @@ static void sdl_mouse_define(int width, int height, int bpp, - int hot_x, int hot_y, - uint8_t *image, uint8_t *mask) - { -- uint8_t sprite[256], *line; -+ uint8_t *sprite, *line; - int x, y, dst, bypl, src = 0; - if (guest_sprite) - SDL_FreeCursor(guest_sprite); - -- memset(sprite, 0, 256); -+ sprite = (uint8_t*)qemu_mallocz(width * height); - bypl = ((width * bpp + 31) >> 5) << 2; - for (y = 0, dst = 0; y < height; y ++, image += bypl) { - line = image; -@@ -818,6 +818,7 @@ static void sdl_mouse_define(int width, int height, int bpp, - if (guest_cursor && - (gui_grab || kbd_mouse_is_absolute() || absolute_enabled)) - SDL_SetCursor(guest_sprite); -+ qemu_free(sprite); - } - - static void sdl_cleanup(void) -- cgit v1.2.3