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>2013-09-26 16:37:14 +0100
commitbdc6d3be6ffa4ed358153f9c9332b632324f5833 (patch)
tree71b999d16962dcb8faf5543fe1c3e3a1a820d523
parent61b2950ebbc01f5e4fd7aece05bf371100c0c390 (diff)
downloadopenembedded-core-bdc6d3be6ffa4ed358153f9c9332b632324f5833.tar.gz
openembedded-core-bdc6d3be6ffa4ed358153f9c9332b632324f5833.tar.bz2
openembedded-core-bdc6d3be6ffa4ed358153f9c9332b632324f5833.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] 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 eb950bc62d..619ffb6bed 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -265,7 +265,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."