summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-01-25 12:54:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:02 +0000
commit8b448ab0127cfc79df8ce601e2e8b93179ebbcbc (patch)
tree02249d25b842f513f454f8e7ea7b6b20779e694d /scripts/runqemu
parent1e88c8fce4e60530a53388e0eac54e4a68a6f924 (diff)
downloadpoky-8b448ab0127cfc79df8ce601e2e8b93179ebbcbc.tar.gz
runqemu: allow bypassing of network setup
At present it is silently assumed all QEMU machines support networking. As a consequence, one cannot run QEMUs without network emulation using "runqemu". This patch allows bypassing any network setup providing the qemuboot.conf file contains: qb_net = none [YOCTO#10661] (From OE-Core rev: 6a9454027ced4efbb401a23df94f711b8253c8fa) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 3d475d32d8..31eff5a082 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -894,6 +894,8 @@ class BaseConfig(object):
894 self.set('NETWORK_CMD', '%s %s' % (self.network_device.replace('@MAC@', mac), qemu_tap_opt)) 894 self.set('NETWORK_CMD', '%s %s' % (self.network_device.replace('@MAC@', mac), qemu_tap_opt))
895 895
896 def setup_network(self): 896 def setup_network(self):
897 if self.get('QB_NET') == 'none':
898 return
897 cmd = "stty -g" 899 cmd = "stty -g"
898 self.saved_stty = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') 900 self.saved_stty = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
899 self.network_device = self.get('QB_NETWORK_DEVICE') or self.network_device 901 self.network_device = self.get('QB_NETWORK_DEVICE') or self.network_device