From 2fedfdca12983cf3240dd7b22ae53d7ee3b2b372 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Thu, 23 Jan 2014 08:32:46 -0600 Subject: runqemu, runqemu-internal: Allow slirp for NFS and KVM use The default slirp address for the NFS server is 10.0.2.2. If not using a tap interface this address must be used or the target system cannot connect properly. Also the ip=... kernel arguments need to be set to dhcp when using slirp or the root NFS will not get setup properly. The call to cleanup() results in a routine which is not defined when setting up the NFS because it is called before acquire() for the locking of the tap interfaces, the solution being to simply not call cleanup() that early. When using slirp, kvm should not execute the vhost net checks because the vhost net will not be configure or used. (From OE-Core rev: 1ea04d87525f26c2cd32ba29c0f14c6226f60729) Signed-off-by: Jason Wessel Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/runqemu | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/runqemu') diff --git a/scripts/runqemu b/scripts/runqemu index dcb2931cac..9272b6f2d5 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -279,10 +279,12 @@ if [ "x$KVM_ENABLED" = "xyes" ]; then exit 1; fi 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 "$YOCTO_PARAVIRT_KVM_WIKI"; - exit 1; + if [ "$SLIRP_ENABLED" != "yes" ] ; then + echo "You have no rights on /dev/vhost-net." + echo "Please change the ownership of this file as described at:" + echo "$YOCTO_PARAVIRT_KVM_WIKI"; + exit 1; + fi fi fi -- cgit v1.2.3-54-g00ecf