summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-02 00:37:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-02 17:33:22 +0000
commitea63409781dc9a5de2d852ec044e55dc82e31a96 (patch)
tree261deca23e9e763cf91a1c8b8cb31feecb86a1e0 /meta/recipes-devtools/qemu
parent9a448fb2c56cb43b171f12d9c7d05e0ec7ce3e0f (diff)
downloadpoky-ea63409781dc9a5de2d852ec044e55dc82e31a96.tar.gz
qemu-0.13.0: Add patch to avoid mmap_min_addr
* This patch is taken from OE commit 40e293342ca76921904a43b03b635d9219432edf (From OE-Core rev: 11d76595e036f46906859b59dc06094b2e979771) 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')
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch37
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.13.0.bb6
2 files changed, 41 insertions, 2 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch
new file mode 100644
index 0000000000..7c782b92a4
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch
@@ -0,0 +1,37 @@
1From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 13 May 2010 12:23:40 +0200
4Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read
5
6* 65536 is default at least for ubuntu and fedora.
7---
8 linux-user/main.c | 5 +++++
9 1 files changed, 5 insertions(+), 0 deletions(-)
10
11Index: qemu-0.13.0/linux-user/main.c
12===================================================================
13--- qemu-0.13.0.orig/linux-user/main.c
14+++ qemu-0.13.0/linux-user/main.c
15@@ -36,6 +36,7 @@
16 #include "envlist.h"
17
18 #define DEBUG_LOGFILE "/tmp/qemu.log"
19+#define MMAP_MIN_ADDR_DEFAULT 65536
20
21 char *exec_path;
22
23@@ -2973,8 +2974,14 @@ int main(int argc, char **argv, char **e
24 if (fscanf(fp, "%lu", &tmp) == 1) {
25 mmap_min_addr = tmp;
26 qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr);
27+ } else {
28+ qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
29+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
30 }
31 fclose(fp);
32+ } else {
33+ qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
34+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
35 }
36 }
37
diff --git a/meta/recipes-devtools/qemu/qemu_0.13.0.bb b/meta/recipes-devtools/qemu/qemu_0.13.0.bb
index 945c570f7c..71b56b7b54 100644
--- a/meta/recipes-devtools/qemu/qemu_0.13.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.13.0.bb
@@ -3,7 +3,7 @@ require qemu.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6PR = "r0" 6PR = "r1"
7 7
8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
9FILESDIR = "${WORKDIR}" 9FILESDIR = "${WORKDIR}"
@@ -26,7 +26,9 @@ SRC_URI = "\
26 file://parallel_make.patch \ 26 file://parallel_make.patch \
27 file://wacom-tablet-fix.patch \ 27 file://wacom-tablet-fix.patch \
28 file://port92_fix.patch \ 28 file://port92_fix.patch \
29 file://powerpc_rom.bin" 29 file://powerpc_rom.bin \
30 file://fallback-to-safe-mmap_min_addr.patch \
31 "
30 32
31SRC_URI[md5sum] = "397a0d665da8ba9d3b9583629f3d6421" 33SRC_URI[md5sum] = "397a0d665da8ba9d3b9583629f3d6421"
32SRC_URI[sha256sum] = "1e6f5851b05cea6e377c835f4668408d4124cfb845f9948d922808743c5fd877" 34SRC_URI[sha256sum] = "1e6f5851b05cea6e377c835f4668408d4124cfb845f9948d922808743c5fd877"