summaryrefslogtreecommitdiffstats
path: root/meta/packages/qemu
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-21 14:14:06 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-21 14:14:06 +0000
commitdb3dd3ad172687b9345e22a9085fd78ddcb26095 (patch)
tree99ef9e72d354d7ac78bdf3fabd6a9b7e92957237 /meta/packages/qemu
parenta13faf34af360e6b3eb9c5620b5e9aa0eff16a98 (diff)
downloadpoky-db3dd3ad172687b9345e22a9085fd78ddcb26095.tar.gz
qemu: Upgrade to svn revision 6374 for working passthrough
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/06_exit_segfault.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/06_exit_segfault.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/11_signal_sigaction.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/11_signal_sigaction.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/22_net_tuntap_stall.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/22_net_tuntap_stall.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/31_syscalls.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/31_syscalls.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/52_ne2000_return.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/52_ne2000_return.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/63_sparc_build.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/63_sparc_build.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/64_ppc_asm_constraints.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/64_ppc_asm_constraints.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/66_tls_ld.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/66_tls_ld.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/91-oh-sdl-cursor.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/91-oh-sdl-cursor.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/fix-dirent.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/fix-dirent.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/no-strip.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/no-strip.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-add-gl-host-code.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-add-gl-host-code.patch)165
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-amd64-32b-mapping-0.9.0.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-amd64-32b-mapping-0.9.0.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/series (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/series)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6374/workaround_bad_futex_headers.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6190/workaround_bad_futex_headers.patch)0
-rw-r--r--meta/packages/qemu/qemu_svn.bb1
16 files changed, 87 insertions, 79 deletions
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/06_exit_segfault.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/06_exit_segfault.patch
index 06123d0626..06123d0626 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/06_exit_segfault.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/06_exit_segfault.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/11_signal_sigaction.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/11_signal_sigaction.patch
index 33c5e8b12d..33c5e8b12d 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/11_signal_sigaction.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/11_signal_sigaction.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/22_net_tuntap_stall.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/22_net_tuntap_stall.patch
index f2bfbc9102..f2bfbc9102 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/22_net_tuntap_stall.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/22_net_tuntap_stall.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/31_syscalls.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/31_syscalls.patch
index df2aa84bb1..df2aa84bb1 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/31_syscalls.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/31_syscalls.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/52_ne2000_return.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/52_ne2000_return.patch
index e4ea33f2c6..e4ea33f2c6 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/52_ne2000_return.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/52_ne2000_return.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/63_sparc_build.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/63_sparc_build.patch
index 37b38f641b..37b38f641b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/63_sparc_build.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/63_sparc_build.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/64_ppc_asm_constraints.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/64_ppc_asm_constraints.patch
index e4858b79d7..e4858b79d7 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/64_ppc_asm_constraints.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/64_ppc_asm_constraints.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/66_tls_ld.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/66_tls_ld.patch
index 54e02eff8b..54e02eff8b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/66_tls_ld.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/66_tls_ld.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/91-oh-sdl-cursor.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/91-oh-sdl-cursor.patch
index 0d60c1c306..0d60c1c306 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/91-oh-sdl-cursor.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/91-oh-sdl-cursor.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/fix-dirent.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/fix-dirent.patch
index 575dbfa0c9..575dbfa0c9 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/fix-dirent.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/fix-dirent.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/no-strip.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/no-strip.patch
index fc69b37e16..fc69b37e16 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/no-strip.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/no-strip.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-add-gl-host-code.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-add-gl-host-code.patch
index 23aef3830a..3a36a18303 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-add-gl-host-code.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-add-gl-host-code.patch
@@ -1,19 +1,21 @@
1Index: trunk/Makefile.target 1Index: trunk/Makefile.target
2=================================================================== 2===================================================================
3--- trunk.orig/Makefile.target 2009-01-19 23:00:33.000000000 +0000 3--- trunk.orig/Makefile.target 2009-01-21 13:34:48.000000000 +0000
4+++ trunk/Makefile.target 2009-01-19 23:08:18.000000000 +0000 4+++ trunk/Makefile.target 2009-01-21 13:55:54.000000000 +0000
5@@ -199,6 +199,10 @@ 5@@ -194,6 +194,12 @@
6 CPPFLAGS+=-I$(SRC_PATH)/fpu 6 CPPFLAGS+=-I$(SRC_PATH)/fpu
7 LIBOBJS+= op_helper.o helper.o 7 LIBOBJS+= op_helper.o helper.o
8 8
9+ifeq ($(TARGET_BASE_ARCH), i386) 9+ifeq ($(TARGET_BASE_ARCH), i386)
10+LIBOBJS+=helper_opengl.o opengl_exec.o 10+LIBOBJS+=helper_opengl.o opengl_exec.o
11+else
12+LIBOBJS+=opengl_dummy.o
11+endif 13+endif
12+ 14+
13 ifeq ($(TARGET_BASE_ARCH), arm) 15 ifeq ($(TARGET_BASE_ARCH), arm)
14 LIBOBJS+= neon_helper.o iwmmxt_helper.o 16 LIBOBJS+= neon_helper.o iwmmxt_helper.o
15 endif 17 endif
16@@ -277,6 +281,21 @@ 18@@ -272,6 +278,21 @@
17 cpu-exec.o: cpu-exec.c 19 cpu-exec.o: cpu-exec.c
18 $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< 20 $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
19 21
@@ -35,7 +37,7 @@ Index: trunk/Makefile.target
35 ######################################################### 37 #########################################################
36 # Linux user emulator target 38 # Linux user emulator target
37 39
38@@ -639,7 +658,7 @@ 40@@ -631,7 +652,7 @@
39 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o 41 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
40 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o 42 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
41 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o 43 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
@@ -44,7 +46,7 @@ Index: trunk/Makefile.target
44 endif 46 endif
45 ifeq ($(TARGET_BASE_ARCH), ppc) 47 ifeq ($(TARGET_BASE_ARCH), ppc)
46 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE 48 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
47@@ -774,7 +793,7 @@ 49@@ -769,7 +790,7 @@
48 endif 50 endif
49 51
50 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a 52 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
@@ -55,9 +57,9 @@ Index: trunk/Makefile.target
55 57
56Index: trunk/hw/vmware_vga.c 58Index: trunk/hw/vmware_vga.c
57=================================================================== 59===================================================================
58--- trunk.orig/hw/vmware_vga.c 2009-01-05 11:10:15.000000000 +0000 60--- trunk.orig/hw/vmware_vga.c 2009-01-21 13:34:48.000000000 +0000
59+++ trunk/hw/vmware_vga.c 2009-01-19 23:06:08.000000000 +0000 61+++ trunk/hw/vmware_vga.c 2009-01-21 13:34:49.000000000 +0000
60@@ -485,6 +485,8 @@ 62@@ -484,6 +484,8 @@
61 63
62 #define CMD(f) le32_to_cpu(s->cmd->f) 64 #define CMD(f) le32_to_cpu(s->cmd->f)
63 65
@@ -66,7 +68,7 @@ Index: trunk/hw/vmware_vga.c
66 static inline int vmsvga_fifo_empty(struct vmsvga_state_s *s) 68 static inline int vmsvga_fifo_empty(struct vmsvga_state_s *s)
67 { 69 {
68 if (!s->config || !s->enable) 70 if (!s->config || !s->enable)
69@@ -494,11 +496,18 @@ 71@@ -493,11 +495,18 @@
70 72
71 static inline uint32_t vmsvga_fifo_read_raw(struct vmsvga_state_s *s) 73 static inline uint32_t vmsvga_fifo_read_raw(struct vmsvga_state_s *s)
72 { 74 {
@@ -89,7 +91,7 @@ Index: trunk/hw/vmware_vga.c
89 } 91 }
90 92
91 static inline uint32_t vmsvga_fifo_read(struct vmsvga_state_s *s) 93 static inline uint32_t vmsvga_fifo_read(struct vmsvga_state_s *s)
92@@ -508,12 +517,12 @@ 94@@ -507,12 +516,12 @@
93 95
94 static void vmsvga_fifo_run(struct vmsvga_state_s *s) 96 static void vmsvga_fifo_run(struct vmsvga_state_s *s)
95 { 97 {
@@ -104,7 +106,7 @@ Index: trunk/hw/vmware_vga.c
104 case SVGA_CMD_UPDATE: 106 case SVGA_CMD_UPDATE:
105 case SVGA_CMD_UPDATE_VERBOSE: 107 case SVGA_CMD_UPDATE_VERBOSE:
106 x = vmsvga_fifo_read(s); 108 x = vmsvga_fifo_read(s);
107@@ -613,7 +622,7 @@ 109@@ -612,7 +621,7 @@
108 while (args --) 110 while (args --)
109 vmsvga_fifo_read(s); 111 vmsvga_fifo_read(s);
110 printf("%s: Unknown command 0x%02x in SVGA command FIFO\n", 112 printf("%s: Unknown command 0x%02x in SVGA command FIFO\n",
@@ -115,9 +117,9 @@ Index: trunk/hw/vmware_vga.c
115 117
116Index: trunk/kqemu.c 118Index: trunk/kqemu.c
117=================================================================== 119===================================================================
118--- trunk.orig/kqemu.c 2009-01-05 11:10:24.000000000 +0000 120--- trunk.orig/kqemu.c 2009-01-21 13:34:48.000000000 +0000
119+++ trunk/kqemu.c 2009-01-19 23:06:08.000000000 +0000 121+++ trunk/kqemu.c 2009-01-21 13:34:49.000000000 +0000
120@@ -84,6 +84,8 @@ 122@@ -93,6 +93,8 @@
121 int qpi_io_memory; 123 int qpi_io_memory;
122 uint32_t kqemu_comm_base; /* physical address of the QPI communication page */ 124 uint32_t kqemu_comm_base; /* physical address of the QPI communication page */
123 125
@@ -126,7 +128,7 @@ Index: trunk/kqemu.c
126 #define cpuid(index, eax, ebx, ecx, edx) \ 128 #define cpuid(index, eax, ebx, ecx, edx) \
127 asm volatile ("cpuid" \ 129 asm volatile ("cpuid" \
128 : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) \ 130 : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) \
129@@ -867,6 +869,22 @@ 131@@ -860,6 +862,22 @@
130 else 132 else
131 env->hflags &= ~HF_OSFXSR_MASK; 133 env->hflags &= ~HF_OSFXSR_MASK;
132 134
@@ -146,13 +148,13 @@ Index: trunk/kqemu.c
146+ } 148+ }
147+ } 149+ }
148+ 150+
149 #ifdef DEBUG 151 LOG_INT("kqemu: kqemu_cpu_exec: ret=0x%x\n", ret);
150 if (loglevel & CPU_LOG_INT) { 152 if (ret == KQEMU_RET_SYSCALL) {
151 fprintf(logfile, "kqemu: kqemu_cpu_exec: ret=0x%x\n", ret); 153 /* syscall instruction */
152Index: trunk/sdl.c 154Index: trunk/sdl.c
153=================================================================== 155===================================================================
154--- trunk.orig/sdl.c 2009-01-19 23:00:33.000000000 +0000 156--- trunk.orig/sdl.c 2009-01-21 13:34:49.000000000 +0000
155+++ trunk/sdl.c 2009-01-19 23:28:22.000000000 +0000 157+++ trunk/sdl.c 2009-01-21 13:59:10.000000000 +0000
156@@ -26,6 +26,7 @@ 158@@ -26,6 +26,7 @@
157 #include "sysemu.h" 159 #include "sysemu.h"
158 160
@@ -161,58 +163,51 @@ Index: trunk/sdl.c
161 163
162 #ifndef _WIN32 164 #ifndef _WIN32
163 #include <signal.h> 165 #include <signal.h>
164@@ -50,6 +51,10 @@ 166@@ -52,6 +53,8 @@
165 static int guest_x, guest_y; 167 static int guest_x, guest_y;
166 static SDL_Cursor *guest_sprite = 0; 168 static SDL_Cursor *guest_sprite = 0;
167 169
168+#ifdef TARGET_OPENGL_OK
169+extern void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window); 170+extern void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window);
170+#endif
171+ 171+
172 static void sdl_update(DisplayState *ds, int x, int y, int w, int h) 172 static void sdl_update(DisplayState *ds, int x, int y, int w, int h)
173 { 173 {
174 // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); 174 SDL_Rect rec;
175@@ -58,6 +63,7 @@ 175@@ -83,6 +86,7 @@
176 176
177 static void sdl_resize(DisplayState *ds, int w, int h) 177 static void sdl_resize(DisplayState *ds)
178 { 178 {
179+ SDL_SysWMinfo info; 179+ SDL_SysWMinfo info;
180 int flags; 180 int flags;
181 181
182 // printf("resizing to %d %d\n", w, h); 182 // printf("resizing to %d %d\n", w, h);
183@@ -72,6 +78,17 @@ 183@@ -93,12 +97,26 @@
184 height = h; 184 if (gui_noframe)
185 flags |= SDL_NOFRAME;
185 186
186 again: 187+ if (ds_get_data(ds) != NULL) {
187+ if (ds->data != NULL) {
188+ SDL_VERSION(&info.version); 188+ SDL_VERSION(&info.version);
189+ SDL_GetWMInfo(&info); 189+ SDL_GetWMInfo(&info);
190+#ifdef TARGET_OPENGL_OK
191+ if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display) 190+ if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display)
192+ opengl_exec_set_parent_window(info.info.x11.display, 191+ opengl_exec_set_parent_window(info.info.x11.display,
193+ RootWindow(info.info.x11.display, 192+ RootWindow(info.info.x11.display,
194+ DefaultScreen(info.info.x11.display))); 193+ DefaultScreen(info.info.x11.display)));
195+#endif
196+ } 194+ }
197+ 195+
198 screen = SDL_SetVideoMode(w, h, 0, flags); 196 real_screen = SDL_SetVideoMode(ds_get_width(ds), ds_get_height(ds), 0, flags);
199 if (!screen) { 197 if (!real_screen) {
200 fprintf(stderr, "Could not open SDL display\n");
201@@ -86,6 +103,13 @@
202 fprintf(stderr, "Could not open SDL display\n"); 198 fprintf(stderr, "Could not open SDL display\n");
203 exit(1); 199 exit(1);
204 } 200 }
205+ 201
206+ SDL_VERSION(&info.version); 202+ SDL_VERSION(&info.version);
207+ SDL_GetWMInfo(&info); 203+ SDL_GetWMInfo(&info);
208+#ifdef TARGET_OPENGL_OK 204+
209+ opengl_exec_set_parent_window(info.info.x11.display, info.info.x11.window); 205+ opengl_exec_set_parent_window(info.info.x11.display, info.info.x11.window);
210+#endif
211+ 206+
212 ds->data = screen->pixels; 207 sdl_setdata(ds);
213 ds->linesize = screen->pitch; 208 }
214 ds->depth = screen->format->BitsPerPixel; 209
215@@ -574,6 +598,10 @@ 210@@ -570,6 +588,10 @@
216 line = image; 211 line = image;
217 for (x = 0; x < width; x ++, dst ++) { 212 for (x = 0; x < width; x ++, dst ++) {
218 switch (bpp) { 213 switch (bpp) {
@@ -223,18 +218,18 @@ Index: trunk/sdl.c
223 case 24: 218 case 24:
224 src = *(line ++); src |= *(line ++); src |= *(line ++); 219 src = *(line ++); src |= *(line ++); src |= *(line ++);
225 break; 220 break;
226@@ -643,6 +671,7 @@ 221@@ -643,6 +665,7 @@
227 ds->dpy_fill = sdl_fill; 222 dcl->dpy_fill = sdl_fill;
228 ds->mouse_set = sdl_mouse_warp; 223 ds->mouse_set = sdl_mouse_warp;
229 ds->cursor_define = sdl_mouse_define; 224 ds->cursor_define = sdl_mouse_define;
230+ ds->data = NULL; 225+ ds->surface->data = NULL;
226 register_displaychangelistener(ds, dcl);
231 227
232 sdl_resize(ds, 640, 400);
233 sdl_update_caption(); 228 sdl_update_caption();
234Index: trunk/target-i386/beginend_funcs.sh 229Index: trunk/target-i386/beginend_funcs.sh
235=================================================================== 230===================================================================
236--- /dev/null 1970-01-01 00:00:00.000000000 +0000 231--- /dev/null 1970-01-01 00:00:00.000000000 +0000
237+++ trunk/target-i386/beginend_funcs.sh 2009-01-19 23:06:08.000000000 +0000 232+++ trunk/target-i386/beginend_funcs.sh 2009-01-21 13:34:49.000000000 +0000
238@@ -0,0 +1,23 @@ 233@@ -0,0 +1,23 @@
239+#! /bin/sh 234+#! /bin/sh
240+# Copyright 2008 (C) Intel Corporation 235+# Copyright 2008 (C) Intel Corporation
@@ -262,7 +257,7 @@ Index: trunk/target-i386/beginend_funcs.sh
262Index: trunk/target-i386/ghash.c 257Index: trunk/target-i386/ghash.c
263=================================================================== 258===================================================================
264--- /dev/null 1970-01-01 00:00:00.000000000 +0000 259--- /dev/null 1970-01-01 00:00:00.000000000 +0000
265+++ trunk/target-i386/ghash.c 2009-01-19 23:06:08.000000000 +0000 260+++ trunk/target-i386/ghash.c 2009-01-21 13:34:49.000000000 +0000
266@@ -0,0 +1,347 @@ 261@@ -0,0 +1,347 @@
267+/* This is a modified and simplified version of original ghash.c */ 262+/* This is a modified and simplified version of original ghash.c */
268+ 263+
@@ -614,7 +609,7 @@ Index: trunk/target-i386/ghash.c
614Index: trunk/target-i386/ghash.h 609Index: trunk/target-i386/ghash.h
615=================================================================== 610===================================================================
616--- /dev/null 1970-01-01 00:00:00.000000000 +0000 611--- /dev/null 1970-01-01 00:00:00.000000000 +0000
617+++ trunk/target-i386/ghash.h 2009-01-19 23:06:08.000000000 +0000 612+++ trunk/target-i386/ghash.h 2009-01-21 13:34:49.000000000 +0000
618@@ -0,0 +1,59 @@ 613@@ -0,0 +1,59 @@
619+/* This is a modified and simplified version of original ghash.h */ 614+/* This is a modified and simplified version of original ghash.h */
620+ 615+
@@ -678,7 +673,7 @@ Index: trunk/target-i386/ghash.h
678Index: trunk/target-i386/gl_func_perso.h 673Index: trunk/target-i386/gl_func_perso.h
679=================================================================== 674===================================================================
680--- /dev/null 1970-01-01 00:00:00.000000000 +0000 675--- /dev/null 1970-01-01 00:00:00.000000000 +0000
681+++ trunk/target-i386/gl_func_perso.h 2009-01-19 23:06:08.000000000 +0000 676+++ trunk/target-i386/gl_func_perso.h 2009-01-21 13:34:49.000000000 +0000
682@@ -0,0 +1,135 @@ 677@@ -0,0 +1,135 @@
683+/* 678+/*
684+ * Hand-implemented GL/GLX API 679+ * Hand-implemented GL/GLX API
@@ -817,8 +812,8 @@ Index: trunk/target-i386/gl_func_perso.h
817+MAGIC_MACRO(_glGetFeedbackBuffer_fake), 812+MAGIC_MACRO(_glGetFeedbackBuffer_fake),
818Index: trunk/target-i386/helper.h 813Index: trunk/target-i386/helper.h
819=================================================================== 814===================================================================
820--- trunk.orig/target-i386/helper.h 2009-01-05 11:10:06.000000000 +0000 815--- trunk.orig/target-i386/helper.h 2009-01-21 13:34:48.000000000 +0000
821+++ trunk/target-i386/helper.h 2009-01-19 23:06:08.000000000 +0000 816+++ trunk/target-i386/helper.h 2009-01-21 13:34:49.000000000 +0000
822@@ -214,4 +214,6 @@ 817@@ -214,4 +214,6 @@
823 DEF_HELPER_2(rcrq, tl, tl, tl) 818 DEF_HELPER_2(rcrq, tl, tl, tl)
824 #endif 819 #endif
@@ -829,7 +824,7 @@ Index: trunk/target-i386/helper.h
829Index: trunk/target-i386/helper_opengl.c 824Index: trunk/target-i386/helper_opengl.c
830=================================================================== 825===================================================================
831--- /dev/null 1970-01-01 00:00:00.000000000 +0000 826--- /dev/null 1970-01-01 00:00:00.000000000 +0000
832+++ trunk/target-i386/helper_opengl.c 2009-01-19 23:06:08.000000000 +0000 827+++ trunk/target-i386/helper_opengl.c 2009-01-21 13:34:49.000000000 +0000
833@@ -0,0 +1,979 @@ 828@@ -0,0 +1,979 @@
834+/* 829+/*
835+ * Host-side implementation of GL/GLX API 830+ * Host-side implementation of GL/GLX API
@@ -1813,7 +1808,7 @@ Index: trunk/target-i386/helper_opengl.c
1813Index: trunk/target-i386/mesa_enums.c 1808Index: trunk/target-i386/mesa_enums.c
1814=================================================================== 1809===================================================================
1815--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1810--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1816+++ trunk/target-i386/mesa_enums.c 2009-01-19 23:06:08.000000000 +0000 1811+++ trunk/target-i386/mesa_enums.c 2009-01-21 13:34:49.000000000 +0000
1817@@ -0,0 +1,4890 @@ 1812@@ -0,0 +1,4890 @@
1818+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */ 1813+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */
1819+ 1814+
@@ -6708,7 +6703,7 @@ Index: trunk/target-i386/mesa_enums.c
6708Index: trunk/target-i386/mesa_get.c 6703Index: trunk/target-i386/mesa_get.c
6709=================================================================== 6704===================================================================
6710--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6705--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6711+++ trunk/target-i386/mesa_get.c 2009-01-19 23:06:08.000000000 +0000 6706+++ trunk/target-i386/mesa_get.c 2009-01-21 13:34:49.000000000 +0000
6712@@ -0,0 +1,5563 @@ 6707@@ -0,0 +1,5563 @@
6713+ 6708+
6714+/*** 6709+/***
@@ -12276,7 +12271,7 @@ Index: trunk/target-i386/mesa_get.c
12276Index: trunk/target-i386/mesa_gl.h 12271Index: trunk/target-i386/mesa_gl.h
12277=================================================================== 12272===================================================================
12278--- /dev/null 1970-01-01 00:00:00.000000000 +0000 12273--- /dev/null 1970-01-01 00:00:00.000000000 +0000
12279+++ trunk/target-i386/mesa_gl.h 2009-01-19 23:06:08.000000000 +0000 12274+++ trunk/target-i386/mesa_gl.h 2009-01-21 13:34:49.000000000 +0000
12280@@ -0,0 +1,2251 @@ 12275@@ -0,0 +1,2251 @@
12281+/* 12276+/*
12282+ * Mesa 3-D graphics library 12277+ * Mesa 3-D graphics library
@@ -14532,7 +14527,7 @@ Index: trunk/target-i386/mesa_gl.h
14532Index: trunk/target-i386/mesa_glext.h 14527Index: trunk/target-i386/mesa_glext.h
14533=================================================================== 14528===================================================================
14534--- /dev/null 1970-01-01 00:00:00.000000000 +0000 14529--- /dev/null 1970-01-01 00:00:00.000000000 +0000
14535+++ trunk/target-i386/mesa_glext.h 2009-01-19 23:06:08.000000000 +0000 14530+++ trunk/target-i386/mesa_glext.h 2009-01-21 13:34:49.000000000 +0000
14536@@ -0,0 +1,7279 @@ 14531@@ -0,0 +1,7279 @@
14537+#ifndef __glext_h_ 14532+#ifndef __glext_h_
14538+#define __glext_h_ 14533+#define __glext_h_
@@ -21816,7 +21811,7 @@ Index: trunk/target-i386/mesa_glext.h
21816Index: trunk/target-i386/mesa_glu.h 21811Index: trunk/target-i386/mesa_glu.h
21817=================================================================== 21812===================================================================
21818--- /dev/null 1970-01-01 00:00:00.000000000 +0000 21813--- /dev/null 1970-01-01 00:00:00.000000000 +0000
21819+++ trunk/target-i386/mesa_glu.h 2009-01-19 23:06:08.000000000 +0000 21814+++ trunk/target-i386/mesa_glu.h 2009-01-21 13:34:49.000000000 +0000
21820@@ -0,0 +1,354 @@ 21815@@ -0,0 +1,354 @@
21821+/* 21816+/*
21822+** License Applicability. Except to the extent portions of this file are 21817+** License Applicability. Except to the extent portions of this file are
@@ -22175,7 +22170,7 @@ Index: trunk/target-i386/mesa_glu.h
22175Index: trunk/target-i386/mesa_glx.h 22170Index: trunk/target-i386/mesa_glx.h
22176=================================================================== 22171===================================================================
22177--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22172--- /dev/null 1970-01-01 00:00:00.000000000 +0000
22178+++ trunk/target-i386/mesa_glx.h 2009-01-19 23:06:08.000000000 +0000 22173+++ trunk/target-i386/mesa_glx.h 2009-01-21 13:34:49.000000000 +0000
22179@@ -0,0 +1,510 @@ 22174@@ -0,0 +1,510 @@
22180+/* 22175+/*
22181+ * Mesa 3-D graphics library 22176+ * Mesa 3-D graphics library
@@ -22690,7 +22685,7 @@ Index: trunk/target-i386/mesa_glx.h
22690Index: trunk/target-i386/mesa_glxext.h 22685Index: trunk/target-i386/mesa_glxext.h
22691=================================================================== 22686===================================================================
22692--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22687--- /dev/null 1970-01-01 00:00:00.000000000 +0000
22693+++ trunk/target-i386/mesa_glxext.h 2009-01-19 23:06:08.000000000 +0000 22688+++ trunk/target-i386/mesa_glxext.h 2009-01-21 13:34:49.000000000 +0000
22694@@ -0,0 +1,785 @@ 22689@@ -0,0 +1,785 @@
22695+#ifndef __glxext_h_ 22690+#ifndef __glxext_h_
22696+#define __glxext_h_ 22691+#define __glxext_h_
@@ -23480,7 +23475,7 @@ Index: trunk/target-i386/mesa_glxext.h
23480Index: trunk/target-i386/mesa_mipmap.c 23475Index: trunk/target-i386/mesa_mipmap.c
23481=================================================================== 23476===================================================================
23482--- /dev/null 1970-01-01 00:00:00.000000000 +0000 23477--- /dev/null 1970-01-01 00:00:00.000000000 +0000
23483+++ trunk/target-i386/mesa_mipmap.c 2009-01-19 23:06:08.000000000 +0000 23478+++ trunk/target-i386/mesa_mipmap.c 2009-01-21 13:34:49.000000000 +0000
23484@@ -0,0 +1,824 @@ 23479@@ -0,0 +1,824 @@
23485+ 23480+
23486+/* 23481+/*
@@ -24309,7 +24304,7 @@ Index: trunk/target-i386/mesa_mipmap.c
24309Index: trunk/target-i386/opengl_exec.c 24304Index: trunk/target-i386/opengl_exec.c
24310=================================================================== 24305===================================================================
24311--- /dev/null 1970-01-01 00:00:00.000000000 +0000 24306--- /dev/null 1970-01-01 00:00:00.000000000 +0000
24312+++ trunk/target-i386/opengl_exec.c 2009-01-19 23:06:08.000000000 +0000 24307+++ trunk/target-i386/opengl_exec.c 2009-01-21 13:34:49.000000000 +0000
24313@@ -0,0 +1,3931 @@ 24308@@ -0,0 +1,3931 @@
24314+/* 24309+/*
24315+ * Host-side implementation of GL/GLX API 24310+ * Host-side implementation of GL/GLX API
@@ -28245,7 +28240,7 @@ Index: trunk/target-i386/opengl_exec.c
28245Index: trunk/target-i386/opengl_func.h 28240Index: trunk/target-i386/opengl_func.h
28246=================================================================== 28241===================================================================
28247--- /dev/null 1970-01-01 00:00:00.000000000 +0000 28242--- /dev/null 1970-01-01 00:00:00.000000000 +0000
28248+++ trunk/target-i386/opengl_func.h 2009-01-19 23:06:08.000000000 +0000 28243+++ trunk/target-i386/opengl_func.h 2009-01-21 13:34:49.000000000 +0000
28249@@ -0,0 +1,1108 @@ 28244@@ -0,0 +1,1108 @@
28250+/* 28245+/*
28251+ * Main header for both host and guest sides 28246+ * Main header for both host and guest sides
@@ -29358,7 +29353,7 @@ Index: trunk/target-i386/opengl_func.h
29358Index: trunk/target-i386/opengl_player.c 29353Index: trunk/target-i386/opengl_player.c
29359=================================================================== 29354===================================================================
29360--- /dev/null 1970-01-01 00:00:00.000000000 +0000 29355--- /dev/null 1970-01-01 00:00:00.000000000 +0000
29361+++ trunk/target-i386/opengl_player.c 2009-01-19 23:06:08.000000000 +0000 29356+++ trunk/target-i386/opengl_player.c 2009-01-21 13:34:49.000000000 +0000
29362@@ -0,0 +1,1461 @@ 29357@@ -0,0 +1,1461 @@
29363+/* 29358+/*
29364+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server 29359+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server
@@ -30824,7 +30819,7 @@ Index: trunk/target-i386/opengl_player.c
30824Index: trunk/target-i386/opengl_server.c 30819Index: trunk/target-i386/opengl_server.c
30825=================================================================== 30820===================================================================
30826--- /dev/null 1970-01-01 00:00:00.000000000 +0000 30821--- /dev/null 1970-01-01 00:00:00.000000000 +0000
30827+++ trunk/target-i386/opengl_server.c 2009-01-19 23:06:08.000000000 +0000 30822+++ trunk/target-i386/opengl_server.c 2009-01-21 13:34:49.000000000 +0000
30828@@ -0,0 +1,826 @@ 30823@@ -0,0 +1,826 @@
30829+/* 30824+/*
30830+ * TCP/IP OpenGL server 30825+ * TCP/IP OpenGL server
@@ -31655,7 +31650,7 @@ Index: trunk/target-i386/opengl_server.c
31655Index: trunk/target-i386/opengl_utils.h 31650Index: trunk/target-i386/opengl_utils.h
31656=================================================================== 31651===================================================================
31657--- /dev/null 1970-01-01 00:00:00.000000000 +0000 31652--- /dev/null 1970-01-01 00:00:00.000000000 +0000
31658+++ trunk/target-i386/opengl_utils.h 2009-01-19 23:06:08.000000000 +0000 31653+++ trunk/target-i386/opengl_utils.h 2009-01-21 13:34:49.000000000 +0000
31659@@ -0,0 +1,453 @@ 31654@@ -0,0 +1,453 @@
31660+/* 31655+/*
31661+ * Functions used by host & client sides 31656+ * Functions used by host & client sides
@@ -32113,7 +32108,7 @@ Index: trunk/target-i386/opengl_utils.h
32113Index: trunk/target-i386/parse_gl_h.c 32108Index: trunk/target-i386/parse_gl_h.c
32114=================================================================== 32109===================================================================
32115--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32110--- /dev/null 1970-01-01 00:00:00.000000000 +0000
32116+++ trunk/target-i386/parse_gl_h.c 2009-01-19 23:06:08.000000000 +0000 32111+++ trunk/target-i386/parse_gl_h.c 2009-01-21 13:34:49.000000000 +0000
32117@@ -0,0 +1,1496 @@ 32112@@ -0,0 +1,1496 @@
32118+/* 32113+/*
32119+ * Parse gl.h et glx.h to auto-generate source code 32114+ * Parse gl.h et glx.h to auto-generate source code
@@ -33614,7 +33609,7 @@ Index: trunk/target-i386/parse_gl_h.c
33614Index: trunk/target-i386/parse_mesa_get_c.c 33609Index: trunk/target-i386/parse_mesa_get_c.c
33615=================================================================== 33610===================================================================
33616--- /dev/null 1970-01-01 00:00:00.000000000 +0000 33611--- /dev/null 1970-01-01 00:00:00.000000000 +0000
33617+++ trunk/target-i386/parse_mesa_get_c.c 2009-01-19 23:06:08.000000000 +0000 33612+++ trunk/target-i386/parse_mesa_get_c.c 2009-01-21 13:34:49.000000000 +0000
33618@@ -0,0 +1,225 @@ 33613@@ -0,0 +1,225 @@
33619+/* 33614+/*
33620+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h" 33615+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h"
@@ -33843,8 +33838,8 @@ Index: trunk/target-i386/parse_mesa_get_c.c
33843+} 33838+}
33844Index: trunk/target-i386/translate.c 33839Index: trunk/target-i386/translate.c
33845=================================================================== 33840===================================================================
33846--- trunk.orig/target-i386/translate.c 2009-01-05 11:10:06.000000000 +0000 33841--- trunk.orig/target-i386/translate.c 2009-01-21 13:34:48.000000000 +0000
33847+++ trunk/target-i386/translate.c 2009-01-19 23:06:08.000000000 +0000 33842+++ trunk/target-i386/translate.c 2009-01-21 13:34:49.000000000 +0000
33848@@ -2592,11 +2592,18 @@ 33843@@ -2592,11 +2592,18 @@
33849 s->is_jmp = 3; 33844 s->is_jmp = 3;
33850 } 33845 }
@@ -33866,9 +33861,9 @@ Index: trunk/target-i386/translate.c
33866 gen_jmp_im(cur_eip); 33861 gen_jmp_im(cur_eip);
33867Index: trunk/vl.c 33862Index: trunk/vl.c
33868=================================================================== 33863===================================================================
33869--- trunk.orig/vl.c 2009-01-05 11:10:23.000000000 +0000 33864--- trunk.orig/vl.c 2009-01-21 13:34:48.000000000 +0000
33870+++ trunk/vl.c 2009-01-19 23:06:08.000000000 +0000 33865+++ trunk/vl.c 2009-01-21 13:34:49.000000000 +0000
33871@@ -240,6 +240,7 @@ 33866@@ -251,6 +251,7 @@
33872 const char *file; 33867 const char *file;
33873 char opt[1024]; 33868 char opt[1024];
33874 } drives_opt[MAX_DRIVES]; 33869 } drives_opt[MAX_DRIVES];
@@ -33876,7 +33871,7 @@ Index: trunk/vl.c
33876 33871
33877 static CPUState *cur_cpu; 33872 static CPUState *cur_cpu;
33878 static CPUState *next_cpu; 33873 static CPUState *next_cpu;
33879@@ -4074,6 +4075,7 @@ 33874@@ -4097,6 +4098,7 @@
33880 QEMU_OPTION_old_param, 33875 QEMU_OPTION_old_param,
33881 QEMU_OPTION_clock, 33876 QEMU_OPTION_clock,
33882 QEMU_OPTION_startdate, 33877 QEMU_OPTION_startdate,
@@ -33884,7 +33879,7 @@ Index: trunk/vl.c
33884 QEMU_OPTION_tb_size, 33879 QEMU_OPTION_tb_size,
33885 QEMU_OPTION_icount, 33880 QEMU_OPTION_icount,
33886 QEMU_OPTION_uuid, 33881 QEMU_OPTION_uuid,
33887@@ -4193,6 +4195,7 @@ 33882@@ -4219,6 +4221,7 @@
33888 #endif 33883 #endif
33889 { "clock", HAS_ARG, QEMU_OPTION_clock }, 33884 { "clock", HAS_ARG, QEMU_OPTION_clock },
33890 { "startdate", HAS_ARG, QEMU_OPTION_startdate }, 33885 { "startdate", HAS_ARG, QEMU_OPTION_startdate },
@@ -33892,7 +33887,7 @@ Index: trunk/vl.c
33892 { "tb-size", HAS_ARG, QEMU_OPTION_tb_size }, 33887 { "tb-size", HAS_ARG, QEMU_OPTION_tb_size },
33893 { "icount", HAS_ARG, QEMU_OPTION_icount }, 33888 { "icount", HAS_ARG, QEMU_OPTION_icount },
33894 { "incoming", HAS_ARG, QEMU_OPTION_incoming }, 33889 { "incoming", HAS_ARG, QEMU_OPTION_incoming },
33895@@ -5105,6 +5108,11 @@ 33890@@ -5166,6 +5169,11 @@
33896 } 33891 }
33897 } 33892 }
33898 break; 33893 break;
@@ -33904,3 +33899,17 @@ Index: trunk/vl.c
33904 case QEMU_OPTION_tb_size: 33899 case QEMU_OPTION_tb_size:
33905 tb_size = strtol(optarg, NULL, 0); 33900 tb_size = strtol(optarg, NULL, 0);
33906 if (tb_size < 0) 33901 if (tb_size < 0)
33902Index: trunk/hw/opengl_dummy.c
33903===================================================================
33904--- /dev/null 1970-01-01 00:00:00.000000000 +0000
33905+++ trunk/hw/opengl_dummy.c 2009-01-21 14:03:41.000000000 +0000
33906@@ -0,0 +1,9 @@
33907+#include "../qemu-common.h"
33908+
33909+#include <X11/Xlib.h>
33910+#include <X11/Xutil.h>
33911+
33912+void opengl_exec_set_parent_window(Display *_dpy, Window _parent_window)
33913+{
33914+ return;
33915+}
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-amd64-32b-mapping-0.9.0.patch
index 40ab59c762..40ab59c762 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-amd64-32b-mapping-0.9.0.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-amd64-32b-mapping-0.9.0.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/series b/meta/packages/qemu/qemu-0.9.1+svnr6374/series
index 57d41df4f6..57d41df4f6 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/series
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/series
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/workaround_bad_futex_headers.patch b/meta/packages/qemu/qemu-0.9.1+svnr6374/workaround_bad_futex_headers.patch
index b254b2410a..b254b2410a 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6190/workaround_bad_futex_headers.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6374/workaround_bad_futex_headers.patch
diff --git a/meta/packages/qemu/qemu_svn.bb b/meta/packages/qemu/qemu_svn.bb
index 088c63041b..5db907ff63 100644
--- a/meta/packages/qemu/qemu_svn.bb
+++ b/meta/packages/qemu/qemu_svn.bb
@@ -13,7 +13,6 @@ SRC_URI = "\
13 file://31_syscalls.patch;patch=1;pnum=0 \ 13 file://31_syscalls.patch;patch=1;pnum=0 \
14 file://52_ne2000_return.patch;patch=1;pnum=1 \ 14 file://52_ne2000_return.patch;patch=1;pnum=1 \
15 file://63_sparc_build.patch;patch=1;pnum=0 \ 15 file://63_sparc_build.patch;patch=1;pnum=0 \
16 file://64_ppc_asm_constraints.patch;patch=1;pnum=1 \
17 file://66_tls_ld.patch;patch=1;pnum=0 \ 16 file://66_tls_ld.patch;patch=1;pnum=0 \
18 file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \ 17 file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \
19 file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \ 18 file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \