summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-25 21:59:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-13 15:37:35 -0700
commit2a07edd04ca9a85273de852e2d10aad6dd08d5a2 (patch)
treef90079f33d3fd9488e668eb6a047352991b9e2f2
parent97300d711dc307c930f3e0292b7c0a1f8ebda27f (diff)
downloadpoky-2a07edd04ca9a85273de852e2d10aad6dd08d5a2.tar.gz
poky-2a07edd04ca9a85273de852e2d10aad6dd08d5a2.tar.bz2
poky-2a07edd04ca9a85273de852e2d10aad6dd08d5a2.zip
runqemu: Use correct kvm CPU options for qemux86* with kvm
The existing -cpu host option caused kernel panics when people attempted to use the kvm option. After research and discussion, the best options appear to be the kvm32/kvm64 cpu types so lets use these instead. These resolve the kernel issues for me. [YOCTO #3908] (From OE-Core master rev: bdc6d3be6ffa4ed358153f9c9332b632324f5833) (From OE-Core rev: 8f3ecfda5e57fbc1903dec1cbb44c92ef599849f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 8ed1226c06..8f03ec308c 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -261,7 +261,11 @@ if [ "x$KVM_ENABLED" = "xyes" ]; then
exit 1;
fi
if [ -w /dev/kvm -a -r /dev/kvm ]; then
- SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu host"
+ if [ "x$MACHINE" = "xqemux86" ]; then
+ SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu kvm32"
+ elif [ "x$MACHINE" = "xqemux86-64" ]; then
+ SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu kvm64"
+ fi
KVM_ACTIVE="yes"
else
echo "You have no rights on /dev/kvm."