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:56 +0100
commitb8819b02dc4ff29d678cc55887dfe6c2d109a67d (patch)
treee64d0c8480c876cbc91f3ef3941e8ff895358713
parent5454f92e57b03d5e01e5aea394686de83b960ce0 (diff)
downloadpoky-b8819b02dc4ff29d678cc55887dfe6c2d109a67d.tar.gz
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 rev: bdc6d3be6ffa4ed358153f9c9332b632324f5833) 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
265 exit 1; 265 exit 1;
266 fi 266 fi
267 if [ -w /dev/kvm -a -r /dev/kvm ]; then 267 if [ -w /dev/kvm -a -r /dev/kvm ]; then
268 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu host" 268 if [ "x$MACHINE" = "xqemux86" ]; then
269 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu kvm32"
270 elif [ "x$MACHINE" = "xqemux86-64" ]; then
271 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu kvm64"
272 fi
269 KVM_ACTIVE="yes" 273 KVM_ACTIVE="yes"
270 else 274 else
271 echo "You have no rights on /dev/kvm." 275 echo "You have no rights on /dev/kvm."