summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include
diff options
context:
space:
mode:
authorMartin Kelly <mkelly@xevo.com>2017-05-02 12:20:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-23 14:07:52 +0100
commit14d67c0f7c125786899eaa131c4fbbf0762766ec (patch)
tree4abd33edc679dae48b410b7653d570ce9748869e /meta/conf/machine/include
parent90106d5afcf4292fb66c265ca9b25eaf23eceb2b (diff)
downloadpoky-14d67c0f7c125786899eaa131c4fbbf0762766ec.tar.gz
qemuboot.conf: make cpus match built artifacts
Currently, the qemu CPUs for are specified as generic, but the built artifacts are not. For example, we build x86-64 artifacts targeting core2duo but run them in qemu with generic qemu/kvm CPUs. This causes some packages that take advantage of the host architecture to crash because they try to use CPU features not advertised by qemu. As an example, Qt uses ssse3. When artifacts linked against Qt and built targeting core2duo attempt to run on a generic qemu/kvm CPU, we get the following crash: Incompatible processor. This Qt build requires the following features: ssse3 We could fix this by making packages like Qt not take advantage of CPU features. However, we will probably keep facing similar issues over time, so it's better to resolve them in a more enduring way. Fix this by making the qemu -cpu arguments match the built artifacts. (From OE-Core rev: 20b3574749420a1fef2cb2e0579584453dd4c5c5) Signed-off-by: Martin Kelly <mkelly@xevo.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index 06ac983d4d..acd03a1ce8 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -1,12 +1,12 @@
1# For runqemu 1# For runqemu
2IMAGE_CLASSES += "qemuboot" 2IMAGE_CLASSES += "qemuboot"
3QB_SYSTEM_NAME_x86 = "qemu-system-i386" 3QB_SYSTEM_NAME_x86 = "qemu-system-i386"
4QB_CPU_x86 = "-cpu qemu32" 4QB_CPU_x86 = "-cpu pentium2"
5QB_CPU_KVM_x86 = "-cpu kvm32" 5QB_CPU_KVM_x86 = "-cpu pentium2"
6 6
7QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" 7QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
8QB_CPU_x86-64 = "-cpu core2duo" 8QB_CPU_x86-64 = "-cpu core2duo"
9QB_CPU_KVM_x86-64 = "-cpu kvm64" 9QB_CPU_KVM_x86-64 = "-cpu core2duo"
10 10
11QB_AUDIO_DRV = "alsa" 11QB_AUDIO_DRV = "alsa"
12QB_AUDIO_OPT = "-soundhw ac97,es1370" 12QB_AUDIO_OPT = "-soundhw ac97,es1370"