summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-16 17:40:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-25 16:38:12 +0000
commit7c62b36a34f3b1491bf3df6a559bc0a74c74c173 (patch)
tree486fc3da0426a673b3778495bbe59a6441f007aa /meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch
parentfcb1b5a4d76f18d5cc1a0327ce41f6c188da6618 (diff)
downloadpoky-7c62b36a34f3b1491bf3df6a559bc0a74c74c173.tar.gz
qemu: Upgrade 0.13.0 -> 0.14.0
* ppc-hack patch is dropped. * Other patches which were direct backports or has been merged upstream in 0.14.0 are also dropped (From OE-Core rev: 97fbdfdbfb15de325fd148bcecc9187d0f778db5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch
new file mode 100644
index 0000000000..3cf0953f10
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch
@@ -0,0 +1,53 @@
1Enable i386-linux-user
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Index: qemu-0.14.0/Makefile.target
6===================================================================
7--- qemu-0.14.0.orig/Makefile.target
8+++ qemu-0.14.0/Makefile.target
9@@ -78,8 +78,13 @@ ifeq ($(TARGET_BASE_ARCH), i386)
10 libobj-y += cpuid.o
11 endif
12 libobj-$(CONFIG_NEED_MMU) += mmu.o
13+ifndef CONFIG_LINUX_USER
14 libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
15 libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
16+else
17+libobj-$(TARGET_I386) += dummygl.o
18+libobj-$(TARGET_X86_64) += dummygl.o
19+endif #CONFIG_LINUX_USER
20 libobj-$(TARGET_ARM) += dummygl.o
21 libobj-$(TARGET_MIPS) += dummygl.o
22 libobj-$(TARGET_PPC) += dummygl.o
23Index: qemu-0.14.0/target-i386/dummygl.c
24===================================================================
25--- /dev/null
26+++ qemu-0.14.0/target-i386/dummygl.c
27@@ -0,0 +1,26 @@
28+#include <string.h>
29+#include <stdlib.h>
30+#include <assert.h>
31+#include <stdint.h>
32+#include <X11/Xlib.h>
33+#include <X11/Xutil.h>
34+
35+void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window)
36+{
37+
38+}
39+
40+void opengl_process_enable(void)
41+{
42+
43+}
44+
45+
46+void mem_opengl(uint64_t ptr)
47+{
48+
49+}
50+
51+void helper_opengl(void)
52+{
53+}