From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 25 Sep 2013 20:59:11 +0000 (+0100)
Subject: runqemu: Use correct kvm CPU options for qemux86* with kvm
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f3ecfda5e57fbc1903dec1cbb44c92ef599849f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/runqemu b/scripts/runqemu
index 8ed1226c061..8f03ec308c5 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."