diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-25 21:59:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-13 15:37:35 -0700 |
commit | 2a07edd04ca9a85273de852e2d10aad6dd08d5a2 (patch) | |
tree | f90079f33d3fd9488e668eb6a047352991b9e2f2 /scripts/runqemu | |
parent | 97300d711dc307c930f3e0292b7c0a1f8ebda27f (diff) | |
download | poky-2a07edd04ca9a85273de852e2d10aad6dd08d5a2.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 master rev: bdc6d3be6ffa4ed358153f9c9332b632324f5833)
(From OE-Core rev: 8f3ecfda5e57fbc1903dec1cbb44c92ef599849f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 6 |
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 | |||
261 | exit 1; | 261 | exit 1; |
262 | fi | 262 | fi |
263 | if [ -w /dev/kvm -a -r /dev/kvm ]; then | 263 | if [ -w /dev/kvm -a -r /dev/kvm ]; then |
264 | SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu host" | 264 | if [ "x$MACHINE" = "xqemux86" ]; then |
265 | SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu kvm32" | ||
266 | elif [ "x$MACHINE" = "xqemux86-64" ]; then | ||
267 | SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu kvm64" | ||
268 | fi | ||
265 | KVM_ACTIVE="yes" | 269 | KVM_ACTIVE="yes" |
266 | else | 270 | else |
267 | echo "You have no rights on /dev/kvm." | 271 | echo "You have no rights on /dev/kvm." |