summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2015-05-06 18:21:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-07 13:40:35 +0100
commit19d57558994e66e2463e03d12e9e90d99988ec8d (patch)
tree6f6232b6f9df622759eaf3378e1b4b280de57b6b
parentfc94b83be48c891b0250a286cf43befd5b66994a (diff)
downloadpoky-19d57558994e66e2463e03d12e9e90d99988ec8d.tar.gz
qemu: upgrade to 2.3.0
Qemu-Arm-versatilepb-Add-memory-size-checking.patch brought up to date; 37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch removed, integrated upstream; glx enable config option changed to opengl enable, update accordingly. (From OE-Core rev: b88e3808533a7280c85e570a1359efcba8dcc4bd) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch22
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch59
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.3.0.bb (renamed from meta/recipes-devtools/qemu/qemu_2.2.0.bb)5
4 files changed, 15 insertions, 73 deletions
diff --git a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
index b0c2ea5be9..1a6cf5119b 100644
--- a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
+++ b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
@@ -18,27 +18,29 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18Update it when upgrade qemu to 2.2.0 18Update it when upgrade qemu to 2.2.0
19 19
20Signed-off-by: Kai Kang <kai.kang@windriver.com> 20Signed-off-by: Kai Kang <kai.kang@windriver.com>
21Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
21--- 22---
22 hw/arm/versatilepb.c | 6 ++++++ 23 hw/arm/versatilepb.c | 7 +++++++
23 1 file changed, 6 insertions(+) 24 1 file changed, 7 insertions(+)
24 25
25diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c 26diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
26index b48d84c..ad2cd5a 100644 27index 6c69f4e..9278d90 100644
27--- a/hw/arm/versatilepb.c 28--- a/hw/arm/versatilepb.c
28+++ b/hw/arm/versatilepb.c 29+++ b/hw/arm/versatilepb.c
29@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id) 30@@ -204,6 +204,13 @@ static void versatile_init(MachineState *machine, int board_id)
30 fprintf(stderr, "Unable to find CPU definition\n");
31 exit(1); 31 exit(1);
32 } 32 }
33+ if (ram_size > (256 << 20)) { 33
34+ if (machine->ram_size > (256 << 20)) {
34+ fprintf(stderr, 35+ fprintf(stderr,
35+ "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n", 36+ "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n",
36+ ((unsigned int)ram_size / (1 << 20))); 37+ ((unsigned int)ram_size / (1 << 20)));
37+ exit(1); 38+ exit(1);
38+ } 39+ }
39 memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size, 40+
40 &error_abort); 41 cpuobj = object_new(object_class_get_name(cpu_oc));
41 vmstate_register_ram_global(ram); 42
43 /* By default ARM1176 CPUs have EL3 enabled. This board does not
42-- 44--
431.7.10.4 452.1.0
44 46
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 4225db7573..4274b252e5 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -115,7 +115,7 @@ PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
115PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" 115PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"
116PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" 116PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
117PACKAGECONFIG[alsa] = ",,alsa-lib" 117PACKAGECONFIG[alsa] = ",,alsa-lib"
118PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa" 118PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,mesa"
119PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" 119PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo"
120PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" 120PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl"
121 121
diff --git a/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch b/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch
deleted file mode 100644
index 8609e3fe99..0000000000
--- a/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1Without this patch, x86_64 images would show invalid EDSCA key errors
2with sshd from openssh (but not dropbear) during init.
3
4This would cause problems with operation with some distros where EDSCA
5keys were mandatory. The issue was present in qemu 2.2.1 and not in
62.3.0-rc0, bisected to this commit which was then backported.
7
8From 37ed3bf1ee07bb1a26adca0df8718f601f231c0b Mon Sep 17 00:00:00 2001
9From: Richard Henderson <rth@twiddle.net>
10Date: Fri, 20 Feb 2015 11:13:50 -0800
11Subject: [PATCH] tcg: Complete handling of ALWAYS and NEVER
12
13Missing from movcond
14
15Signed-off-by: Richard Henderson <rth@twiddle.net>
16---
17 tcg/tcg-op.c | 22 +++++++++++++++++-----
18 1 files changed, 17 insertions(+), 5 deletions(-)
19
20Upstream-Status: Backport
21RP 2015/3/24
22
23Index: qemu-2.2.0/tcg/tcg-op.h
24===================================================================
25--- qemu-2.2.0.orig/tcg/tcg-op.h
26+++ qemu-2.2.0/tcg/tcg-op.h
27@@ -2186,7 +2186,11 @@ static inline void tcg_gen_movcond_i32(T
28 TCGv_i32 c1, TCGv_i32 c2,
29 TCGv_i32 v1, TCGv_i32 v2)
30 {
31- if (TCG_TARGET_HAS_movcond_i32) {
32+ if (cond == TCG_COND_ALWAYS) {
33+ tcg_gen_mov_i32(ret, v1);
34+ } else if (cond == TCG_COND_NEVER) {
35+ tcg_gen_mov_i32(ret, v2);
36+ } else if (TCG_TARGET_HAS_movcond_i32) {
37 tcg_gen_op6i_i32(INDEX_op_movcond_i32, ret, c1, c2, v1, v2, cond);
38 } else {
39 TCGv_i32 t0 = tcg_temp_new_i32();
40@@ -2205,6 +2209,11 @@ static inline void tcg_gen_movcond_i64(T
41 TCGv_i64 c1, TCGv_i64 c2,
42 TCGv_i64 v1, TCGv_i64 v2)
43 {
44+ if (cond == TCG_COND_ALWAYS) {
45+ tcg_gen_mov_i64(ret, v1);
46+ } else if (cond == TCG_COND_NEVER) {
47+ tcg_gen_mov_i64(ret, v2);
48+ } else {
49 #if TCG_TARGET_REG_BITS == 32
50 TCGv_i32 t0 = tcg_temp_new_i32();
51 TCGv_i32 t1 = tcg_temp_new_i32();
52@@ -2246,6 +2255,7 @@ static inline void tcg_gen_movcond_i64(T
53 tcg_temp_free_i64(t1);
54 }
55 #endif
56+ }
57 }
58
59 static inline void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
diff --git a/meta/recipes-devtools/qemu/qemu_2.2.0.bb b/meta/recipes-devtools/qemu/qemu_2.3.0.bb
index 757de89640..25c5e4d539 100644
--- a/meta/recipes-devtools/qemu/qemu_2.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.3.0.bb
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
6SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ 6SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
7 file://qemu-enlarge-env-entry-size.patch \ 7 file://qemu-enlarge-env-entry-size.patch \
8 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ 8 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
9 file://37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch \
10 " 9 "
11SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 10SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
12SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8" 11SRC_URI[md5sum] = "2fab3ea4460de9b57192e5b8b311f221"
13SRC_URI[sha256sum] = "b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c" 12SRC_URI[sha256sum] = "b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588"
14 13
15COMPATIBLE_HOST_class-target_mips64 = "null" 14COMPATIBLE_HOST_class-target_mips64 = "null"
16 15