From a5c1069d2c0570186792d61151e1865642afd73a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 9 Mar 2018 20:55:52 +0200 Subject: qemu: refresh patches The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../qemu/qemu/apic-fixup-fallthrough-to-PIC.patch | 15 ++++++-------- .../recipes-devtools/qemu/qemu/disable-grabs.patch | 23 ++++++++++------------ 2 files changed, 16 insertions(+), 22 deletions(-) (limited to 'meta/recipes-devtools/qemu/qemu') diff --git a/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch index 9bbbc6f76d..d6a3522eda 100644 --- a/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch @@ -28,12 +28,12 @@ Signed-off-by: He Zhe hw/intc/apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index 45887d99..c5ae4087 100644 ---- a/hw/intc/apic.c -+++ b/hw/intc/apic.c -@@ -587,7 +587,7 @@ int apic_accept_pic_intr(DeviceState *dev) - APICCommonState *s = APIC_COMMON(dev); +Index: qemu-2.11.1/hw/intc/apic.c +=================================================================== +--- qemu-2.11.1.orig/hw/intc/apic.c ++++ qemu-2.11.1/hw/intc/apic.c +@@ -591,7 +591,7 @@ int apic_accept_pic_intr(DeviceState *de + APICCommonState *s = APIC(dev); uint32_t lvt0; - if (!s) @@ -41,6 +41,3 @@ index 45887d99..c5ae4087 100644 return -1; lvt0 = s->lvt[APIC_LVT_LINT0]; --- -2.11.0 - diff --git a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch index 123833f824..77117890f4 100644 --- a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch +++ b/meta/recipes-devtools/qemu/qemu/disable-grabs.patch @@ -24,11 +24,11 @@ Signed-off-by: Eric Bénard ui/sdl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/ui/sdl.c b/ui/sdl.c -index 39a42d6..9b8abe5 100644 ---- a/ui/sdl.c -+++ b/ui/sdl.c -@@ -59,6 +59,10 @@ static SDL_Cursor *guest_sprite = NULL; +Index: qemu-2.11.1/ui/sdl.c +=================================================================== +--- qemu-2.11.1.orig/ui/sdl.c ++++ qemu-2.11.1/ui/sdl.c +@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format; static int scaling_active = 0; static Notifier mouse_mode_notifier; static int idle_counter; @@ -37,10 +37,10 @@ index 39a42d6..9b8abe5 100644 +#endif +static doing_grabs = True; - static void sdl_update(DisplayChangeListener *dcl, - int x, int y, int w, int h) -@@ -384,14 +388,16 @@ static void sdl_grab_start(void) - } + #define SDL_REFRESH_INTERVAL_BUSY 10 + #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \ +@@ -431,14 +435,16 @@ static void sdl_grab_start(void) + } } else sdl_hide_cursor(); - SDL_WM_GrabInput(SDL_GRAB_ON); @@ -58,7 +58,7 @@ index 39a42d6..9b8abe5 100644 gui_grab = 0; sdl_show_cursor(); sdl_update_caption(); -@@ -909,6 +915,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) +@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds, * This requires SDL >= 1.2.14. */ setenv("SDL_DISABLE_LOCK_KEYS", "1", 1); @@ -67,6 +67,3 @@ index 39a42d6..9b8abe5 100644 flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE; if (SDL_Init (flags)) { fprintf(stderr, "Could not initialize SDL(%s) - exiting\n", --- -1.8.3.1 - -- cgit 1.2.3-korg