[oe-commits] Richard Purdie : runqemu: Use correct kvm CPU options for qemux86* with kvm

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dylan
Commit: 8f3ecfda5e57fbc1903dec1cbb44c92ef599849f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8f3ecfda5e57fbc1903dec1cbb44c92ef599849f

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Sep 25 21:59:11 2013 +0100

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 at linuxfoundation.org>

---

 scripts/runqemu | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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