summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-24 09:08:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-25 12:39:40 (GMT)
commit7cb5ea06b85164c0190e85677ab9b163f2ecacd4 (patch)
tree7f0178174ab350d14aa6b6e8dd7f1e547af6e4f3
parent443938795e506bdc217ced44677032a8eeaa12fe (diff)
downloadpoky-7cb5ea06b85164c0190e85677ab9b163f2ecacd4.tar.gz
poky-7cb5ea06b85164c0190e85677ab9b163f2ecacd4.tar.xz
qemu: Add patch to fix qemux86-64 EDSCA key problems
Without this patch, x86_64 images would show invalid EDSCA key errors with sshd from openssh (but not dropbear) during init. This would cause problems with operation with some distros where EDSCA keys were mandatory. The issue was present in qemu 2.2.1 and not in 2.3.0-rc0, bisected to this commit which was then backported. This fixes intermittent failures on the autobuilder. Issue is not present when using KVM (consistent with a fault in TCG). (From OE-Core rev: 27fe06cb7d30c79833769b3ebb080a7a8115439d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch59
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.2.0.bb1
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch b/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch
new file mode 100644
index 0000000..8609e3f
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch
@@ -0,0 +1,59 @@
+Without this patch, x86_64 images would show invalid EDSCA key errors
+with sshd from openssh (but not dropbear) during init.
+
+This would cause problems with operation with some distros where EDSCA
+keys were mandatory. The issue was present in qemu 2.2.1 and not in
+2.3.0-rc0, bisected to this commit which was then backported.
+
+From 37ed3bf1ee07bb1a26adca0df8718f601f231c0b Mon Sep 17 00:00:00 2001
+From: Richard Henderson <rth@twiddle.net>
+Date: Fri, 20 Feb 2015 11:13:50 -0800
+Subject: [PATCH] tcg: Complete handling of ALWAYS and NEVER
+
+Missing from movcond
+
+Signed-off-by: Richard Henderson <rth@twiddle.net>
+---
+ tcg/tcg-op.c | 22 +++++++++++++++++-----
+ 1 files changed, 17 insertions(+), 5 deletions(-)
+
+Upstream-Status: Backport
+RP 2015/3/24
+
+Index: qemu-2.2.0/tcg/tcg-op.h
+===================================================================
+--- qemu-2.2.0.orig/tcg/tcg-op.h
++++ qemu-2.2.0/tcg/tcg-op.h
+@@ -2186,7 +2186,11 @@ static inline void tcg_gen_movcond_i32(T
+ TCGv_i32 c1, TCGv_i32 c2,
+ TCGv_i32 v1, TCGv_i32 v2)
+ {
+- if (TCG_TARGET_HAS_movcond_i32) {
++ if (cond == TCG_COND_ALWAYS) {
++ tcg_gen_mov_i32(ret, v1);
++ } else if (cond == TCG_COND_NEVER) {
++ tcg_gen_mov_i32(ret, v2);
++ } else if (TCG_TARGET_HAS_movcond_i32) {
+ tcg_gen_op6i_i32(INDEX_op_movcond_i32, ret, c1, c2, v1, v2, cond);
+ } else {
+ TCGv_i32 t0 = tcg_temp_new_i32();
+@@ -2205,6 +2209,11 @@ static inline void tcg_gen_movcond_i64(T
+ TCGv_i64 c1, TCGv_i64 c2,
+ TCGv_i64 v1, TCGv_i64 v2)
+ {
++ if (cond == TCG_COND_ALWAYS) {
++ tcg_gen_mov_i64(ret, v1);
++ } else if (cond == TCG_COND_NEVER) {
++ tcg_gen_mov_i64(ret, v2);
++ } else {
+ #if TCG_TARGET_REG_BITS == 32
+ TCGv_i32 t0 = tcg_temp_new_i32();
+ TCGv_i32 t1 = tcg_temp_new_i32();
+@@ -2246,6 +2255,7 @@ static inline void tcg_gen_movcond_i64(T
+ tcg_temp_free_i64(t1);
+ }
+ #endif
++ }
+ }
+
+ 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.2.0.bb
index 209b910..757de89 100644
--- a/meta/recipes-devtools/qemu/qemu_2.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
file://qemu-enlarge-env-entry-size.patch \
file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
+ file://37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch \
"
SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8"