summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch15
-rw-r--r--meta/recipes-devtools/qemu/qemu/disable-grabs.patch23
2 files changed, 16 insertions, 22 deletions
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 <zhe.he@windriver.com>
28 hw/intc/apic.c | 2 +- 28 hw/intc/apic.c | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-) 29 1 file changed, 1 insertion(+), 1 deletion(-)
30 30
31diff --git a/hw/intc/apic.c b/hw/intc/apic.c 31Index: qemu-2.11.1/hw/intc/apic.c
32index 45887d99..c5ae4087 100644 32===================================================================
33--- a/hw/intc/apic.c 33--- qemu-2.11.1.orig/hw/intc/apic.c
34+++ b/hw/intc/apic.c 34+++ qemu-2.11.1/hw/intc/apic.c
35@@ -587,7 +587,7 @@ int apic_accept_pic_intr(DeviceState *dev) 35@@ -591,7 +591,7 @@ int apic_accept_pic_intr(DeviceState *de
36 APICCommonState *s = APIC_COMMON(dev); 36 APICCommonState *s = APIC(dev);
37 uint32_t lvt0; 37 uint32_t lvt0;
38 38
39- if (!s) 39- if (!s)
@@ -41,6 +41,3 @@ index 45887d99..c5ae4087 100644
41 return -1; 41 return -1;
42 42
43 lvt0 = s->lvt[APIC_LVT_LINT0]; 43 lvt0 = s->lvt[APIC_LVT_LINT0];
44--
452.11.0
46
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 <eric@eukrea.com>
24 ui/sdl.c | 12 ++++++++++-- 24 ui/sdl.c | 12 ++++++++++--
25 1 file changed, 10 insertions(+), 2 deletions(-) 25 1 file changed, 10 insertions(+), 2 deletions(-)
26 26
27diff --git a/ui/sdl.c b/ui/sdl.c 27Index: qemu-2.11.1/ui/sdl.c
28index 39a42d6..9b8abe5 100644 28===================================================================
29--- a/ui/sdl.c 29--- qemu-2.11.1.orig/ui/sdl.c
30+++ b/ui/sdl.c 30+++ qemu-2.11.1/ui/sdl.c
31@@ -59,6 +59,10 @@ static SDL_Cursor *guest_sprite = NULL; 31@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format;
32 static int scaling_active = 0; 32 static int scaling_active = 0;
33 static Notifier mouse_mode_notifier; 33 static Notifier mouse_mode_notifier;
34 static int idle_counter; 34 static int idle_counter;
@@ -37,10 +37,10 @@ index 39a42d6..9b8abe5 100644
37+#endif 37+#endif
38+static doing_grabs = True; 38+static doing_grabs = True;
39 39
40 static void sdl_update(DisplayChangeListener *dcl, 40 #define SDL_REFRESH_INTERVAL_BUSY 10
41 int x, int y, int w, int h) 41 #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \
42@@ -384,14 +388,16 @@ static void sdl_grab_start(void) 42@@ -431,14 +435,16 @@ static void sdl_grab_start(void)
43 } 43 }
44 } else 44 } else
45 sdl_hide_cursor(); 45 sdl_hide_cursor();
46- SDL_WM_GrabInput(SDL_GRAB_ON); 46- SDL_WM_GrabInput(SDL_GRAB_ON);
@@ -58,7 +58,7 @@ index 39a42d6..9b8abe5 100644
58 gui_grab = 0; 58 gui_grab = 0;
59 sdl_show_cursor(); 59 sdl_show_cursor();
60 sdl_update_caption(); 60 sdl_update_caption();
61@@ -909,6 +915,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) 61@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds,
62 * This requires SDL >= 1.2.14. */ 62 * This requires SDL >= 1.2.14. */
63 setenv("SDL_DISABLE_LOCK_KEYS", "1", 1); 63 setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
64 64
@@ -67,6 +67,3 @@ index 39a42d6..9b8abe5 100644
67 flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE; 67 flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE;
68 if (SDL_Init (flags)) { 68 if (SDL_Init (flags)) {
69 fprintf(stderr, "Could not initialize SDL(%s) - exiting\n", 69 fprintf(stderr, "Could not initialize SDL(%s) - exiting\n",
70--
711.8.3.1
72