summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-07-28 02:05:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 10:32:39 +0100
commitfc8902f1b549a8008a1fba5af98c059191cb6f2d (patch)
treef78a425b7eea1bd0675335581e78fa332ab2909d /meta/recipes-devtools/qemu/qemu
parent7635f09bf2c425b2e5a360b357c008ef4b170d1e (diff)
downloadpoky-fc8902f1b549a8008a1fba5af98c059191cb6f2d.tar.gz
qemu_git.bb: remove it
Remove it since we have 2.4.0, the git version is 1.3 can't be built by deafult: ERROR: Fetcher failure: Unable to find revision 04024dea2674861fcf13582a77b58130c67fccd8 in branch master even from upstream We can fix it, but seems that no one uses it any more. And move patches from "files" dir to "qemu" dir. (From OE-Core rev: d3c3d62cfb2eeb224fa021af9cd550edf826445e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu')
-rw-r--r--meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch46
-rw-r--r--meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch93
-rw-r--r--meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch31
3 files changed, 170 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
new file mode 100644
index 0000000000..1a6cf5119b
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
@@ -0,0 +1,46 @@
1From 896fa02c24347e6e9259812cfda187b1d6ca6199 Mon Sep 17 00:00:00 2001
2From: Jiang Lu <lu.jiang@windriver.com>
3Date: Wed, 13 Nov 2013 10:38:08 +0800
4Subject: [PATCH] Qemu:Arm:versatilepb: Add memory size checking
5
6The machine can not work with memory over 256M, so add a checking
7at startup. If the memory size exceed 256M, just stop emulation then
8throw out warning about memory limitation.
9
10Upstream-Status: Pending
11
12Signed-off-by: Jiang Lu <lu.jiang@windriver.com>
13
14Updated it on 2014-01-15 for rebasing
15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17
18Update it when upgrade qemu to 2.2.0
19
20Signed-off-by: Kai Kang <kai.kang@windriver.com>
21Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
22---
23 hw/arm/versatilepb.c | 7 +++++++
24 1 file changed, 7 insertions(+)
25
26diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
27index 6c69f4e..9278d90 100644
28--- a/hw/arm/versatilepb.c
29+++ b/hw/arm/versatilepb.c
30@@ -204,6 +204,13 @@ static void versatile_init(MachineState *machine, int board_id)
31 exit(1);
32 }
33
34+ if (machine->ram_size > (256 << 20)) {
35+ fprintf(stderr,
36+ "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n",
37+ ((unsigned int)ram_size / (1 << 20)));
38+ exit(1);
39+ }
40+
41 cpuobj = object_new(object_class_get_name(cpu_oc));
42
43 /* By default ARM1176 CPUs have EL3 enabled. This board does not
44--
452.1.0
46
diff --git a/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch b/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch
new file mode 100644
index 0000000000..171bda7e95
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch
@@ -0,0 +1,93 @@
1[PATCH] exclude some arm EABI obsolete syscalls
2
3Upstream-Status: Pending
4
5some syscalls are obsolete and no longer available for EABI, exclude them to
6fix the below error:
7 In file included from qemu-seccomp.c:16:0:
8 qemu-seccomp.c:28:7: error: '__NR_select' undeclared here (not in a function)
9 { SCMP_SYS(select), 252 },
10 ^
11 qemu-seccomp.c:36:7: error: '__NR_mmap' undeclared here (not in a function)
12 { SCMP_SYS(mmap), 247 },
13 ^
14 qemu-seccomp.c:57:7: error: '__NR_getrlimit' undeclared here (not in a function)
15 { SCMP_SYS(getrlimit), 245 },
16 ^
17 qemu-seccomp.c:96:7: error: '__NR_time' undeclared here (not in a function)
18 { SCMP_SYS(time), 245 },
19 ^
20 qemu-seccomp.c:185:7: error: '__NR_alarm' undeclared here (not in a function)
21 { SCMP_SYS(alarm), 241 },
22
23please refer source files:
24 arch/arm/include/uapi/asm/unistd.h
25or kernel header:
26 /usr/include/asm/unistd.h
27
28Signed-off-by: Roy.Li <rongqing.li@windriver.com>
29---
30 qemu-seccomp.c | 14 ++++++++------
31 1 file changed, 8 insertions(+), 6 deletions(-)
32
33diff --git a/qemu-seccomp.c b/qemu-seccomp.c
34index caa926e..5a78502 100644
35--- a/qemu-seccomp.c
36+++ b/qemu-seccomp.c
37@@ -25,15 +25,21 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
38 { SCMP_SYS(timer_settime), 255 },
39 { SCMP_SYS(timer_gettime), 254 },
40 { SCMP_SYS(futex), 253 },
41+#if !defined(__ARM_EABI__)
42 { SCMP_SYS(select), 252 },
43+ { SCMP_SYS(time), 245 },
44+ { SCMP_SYS(alarm), 241 },
45+ { SCMP_SYS(getrlimit), 245 },
46+ { SCMP_SYS(mmap), 247 },
47+ { SCMP_SYS(socketcall), 250 },
48+ { SCMP_SYS(ipc), 245 },
49+#endif
50 { SCMP_SYS(recvfrom), 251 },
51 { SCMP_SYS(sendto), 250 },
52- { SCMP_SYS(socketcall), 250 },
53 { SCMP_SYS(read), 249 },
54 { SCMP_SYS(io_submit), 249 },
55 { SCMP_SYS(brk), 248 },
56 { SCMP_SYS(clone), 247 },
57- { SCMP_SYS(mmap), 247 },
58 { SCMP_SYS(mprotect), 246 },
59 { SCMP_SYS(execve), 245 },
60 { SCMP_SYS(open), 245 },
61@@ -48,13 +54,11 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
62 { SCMP_SYS(bind), 245 },
63 { SCMP_SYS(listen), 245 },
64 { SCMP_SYS(semget), 245 },
65- { SCMP_SYS(ipc), 245 },
66 { SCMP_SYS(gettimeofday), 245 },
67 { SCMP_SYS(readlink), 245 },
68 { SCMP_SYS(access), 245 },
69 { SCMP_SYS(prctl), 245 },
70 { SCMP_SYS(signalfd), 245 },
71- { SCMP_SYS(getrlimit), 245 },
72 { SCMP_SYS(set_tid_address), 245 },
73 { SCMP_SYS(statfs), 245 },
74 { SCMP_SYS(unlink), 245 },
75@@ -93,7 +97,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
76 { SCMP_SYS(times), 245 },
77 { SCMP_SYS(exit), 245 },
78 { SCMP_SYS(clock_gettime), 245 },
79- { SCMP_SYS(time), 245 },
80 { SCMP_SYS(restart_syscall), 245 },
81 { SCMP_SYS(pwrite64), 245 },
82 { SCMP_SYS(nanosleep), 245 },
83@@ -182,7 +185,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
84 { SCMP_SYS(lstat64), 241 },
85 { SCMP_SYS(sendfile64), 241 },
86 { SCMP_SYS(ugetrlimit), 241 },
87- { SCMP_SYS(alarm), 241 },
88 { SCMP_SYS(rt_sigsuspend), 241 },
89 { SCMP_SYS(rt_sigqueueinfo), 241 },
90 { SCMP_SYS(rt_tgsigqueueinfo), 241 },
91--
921.9.1
93
diff --git a/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch b/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
new file mode 100644
index 0000000000..c7425ab8d4
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
@@ -0,0 +1,31 @@
1qemu: Add addition environment space to boot loader qemu-system-mips
2
3Upstream-Status: Inappropriate - OE uses deep paths
4
5If you create a project with very long directory names like 128 characters
6deep and use NFS, the kernel arguments will be truncated. The kernel will
7accept longer strings such as 1024 bytes, but the qemu boot loader defaulted
8to only 256 bytes. This patch expands the limit.
9
10Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 hw/mips/mips_malta.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
17index 9d521cc..17c0391 100644
18--- a/hw/mips/mips_malta.c
19+++ b/hw/mips/mips_malta.c
20@@ -53,7 +53,7 @@
21
22 #define ENVP_ADDR 0x80002000l
23 #define ENVP_NB_ENTRIES 16
24-#define ENVP_ENTRY_SIZE 256
25+#define ENVP_ENTRY_SIZE 1024
26
27 /* Hardware addresses */
28 #define FLASH_ADDRESS 0x1e000000ULL
29--
301.7.10.4
31