From ef5dcad3e3e3c004112cfc00843727a7fda75cd2 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 3 Oct 2012 15:18:58 +0300 Subject: qemu: Fixed running QEMU with virtio error reporting If vhost_net module is not properly installed, runqemu script will report the error and provide the user with a link to the guide. Also corrected small cosmetic issues in runqemu script messages. Also removed <> (read/write) check. Fixes [YOCTO #3184] (From OE-Core rev: f7365f62325189b0f9a9a1d440f11f2356c8f01d) Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- scripts/runqemu | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/runqemu b/scripts/runqemu index e6e43f20c8..fb7ac56398 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -223,28 +223,28 @@ if [ "x$KVM_ENABLED" = "xyes" ]; then fi if [ ! -e /dev/kvm ]; then echo "Missing KVM device. Have you inserted kvm modules?" - echo "For further help see" + echo "For further help see:" echo "$YOCTO_KVM_WIKI"; exit 1; fi if [ ! -e /dev/vhost-net ]; then echo "Missing virtio net device. Have you inserted vhost-net module?" - echo "For further help see" + echo "For further help see:" echo "$YOCTO_PARAVIRT_KVM_WIKI"; exit 1; fi - if 9<>/dev/kvm ; then + if [ -w /dev/kvm -a -r /dev/kvm ]; then SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu host" KVM_ACTIVE="yes" else echo "You have no rights on /dev/kvm." - echo "Please change the ownership of this file as described at" + echo "Please change the ownership of this file as described at:" echo "$YOCTO_KVM_WIKI"; exit 1; fi - if [ ! -w /dev/vhost-net -a -r /dev/vhost-net ]; then + if [ ! -w /dev/vhost-net -o ! -r /dev/vhost-net ]; then echo "You have no rights on /dev/vhost-net." - echo "Please change the ownership of this file as described at" + echo "Please change the ownership of this file as described at:" echo "$YOCTO_PARAVIRT_KVM_WIKI"; exit 1; fi -- cgit v1.2.3-54-g00ecf