summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/qemuboot-x86.inc
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:47 +0100
commit20b3574749420a1fef2cb2e0579584453dd4c5c5 (patch)
tree0062644a1ec588d64e521c5f0fbe85755a108f76 /meta/conf/machine/include/qemuboot-x86.inc
parent789e3fc225adbb61f10aaa3bbc3677856f5f0238 (diff)
downloadopenembedded-core-contrib-20b3574749420a1fef2cb2e0579584453dd4c5c5.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. 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/qemuboot-x86.inc')
-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 06ac983d4d9..acd03a1ce88 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -1,12 +1,12 @@
# For runqemu
IMAGE_CLASSES += "qemuboot"
QB_SYSTEM_NAME_x86 = "qemu-system-i386"
-QB_CPU_x86 = "-cpu qemu32"
-QB_CPU_KVM_x86 = "-cpu kvm32"
+QB_CPU_x86 = "-cpu pentium2"
+QB_CPU_KVM_x86 = "-cpu pentium2"
QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
QB_CPU_x86-64 = "-cpu core2duo"
-QB_CPU_KVM_x86-64 = "-cpu kvm64"
+QB_CPU_KVM_x86-64 = "-cpu core2duo"
QB_AUDIO_DRV = "alsa"
QB_AUDIO_OPT = "-soundhw ac97,es1370"