summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2012-10-03 15:18:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 13:37:03 +0100
commitef5dcad3e3e3c004112cfc00843727a7fda75cd2 (patch)
tree593d3c5735b2f4dbd93168ab5152911743922a33 /scripts
parent595b119894631189196d00e467bfbc56df38c3a0 (diff)
downloadpoky-ef5dcad3e3e3c004112cfc00843727a7fda75cd2.tar.gz
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 <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu12
1 files changed, 6 insertions, 6 deletions
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
223 fi 223 fi
224 if [ ! -e /dev/kvm ]; then 224 if [ ! -e /dev/kvm ]; then
225 echo "Missing KVM device. Have you inserted kvm modules?" 225 echo "Missing KVM device. Have you inserted kvm modules?"
226 echo "For further help see" 226 echo "For further help see:"
227 echo "$YOCTO_KVM_WIKI"; 227 echo "$YOCTO_KVM_WIKI";
228 exit 1; 228 exit 1;
229 fi 229 fi
230 if [ ! -e /dev/vhost-net ]; then 230 if [ ! -e /dev/vhost-net ]; then
231 echo "Missing virtio net device. Have you inserted vhost-net module?" 231 echo "Missing virtio net device. Have you inserted vhost-net module?"
232 echo "For further help see" 232 echo "For further help see:"
233 echo "$YOCTO_PARAVIRT_KVM_WIKI"; 233 echo "$YOCTO_PARAVIRT_KVM_WIKI";
234 exit 1; 234 exit 1;
235 fi 235 fi
236 if 9<>/dev/kvm ; then 236 if [ -w /dev/kvm -a -r /dev/kvm ]; then
237 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu host" 237 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm -cpu host"
238 KVM_ACTIVE="yes" 238 KVM_ACTIVE="yes"
239 else 239 else
240 echo "You have no rights on /dev/kvm." 240 echo "You have no rights on /dev/kvm."
241 echo "Please change the ownership of this file as described at" 241 echo "Please change the ownership of this file as described at:"
242 echo "$YOCTO_KVM_WIKI"; 242 echo "$YOCTO_KVM_WIKI";
243 exit 1; 243 exit 1;
244 fi 244 fi
245 if [ ! -w /dev/vhost-net -a -r /dev/vhost-net ]; then 245 if [ ! -w /dev/vhost-net -o ! -r /dev/vhost-net ]; then
246 echo "You have no rights on /dev/vhost-net." 246 echo "You have no rights on /dev/vhost-net."
247 echo "Please change the ownership of this file as described at" 247 echo "Please change the ownership of this file as described at:"
248 echo "$YOCTO_PARAVIRT_KVM_WIKI"; 248 echo "$YOCTO_PARAVIRT_KVM_WIKI";
249 exit 1; 249 exit 1;
250 fi 250 fi