summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodor Minchev <todor.minchev@linux.intel.com>2016-10-26 10:05:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:21 +0000
commit80e6fc678f3dcd774d9376cdf2a6afcba2cd0b09 (patch)
tree90ac70fa89f443172f05a3b92e3da2e304903e33
parent614ac87f2832c5359f371439559be88d6106cd6b (diff)
downloadopenembedded-core-contrib-80e6fc678f3dcd774d9376cdf2a6afcba2cd0b09.tar.gz
openembedded-core-contrib-80e6fc678f3dcd774d9376cdf2a6afcba2cd0b09.tar.bz2
openembedded-core-contrib-80e6fc678f3dcd774d9376cdf2a6afcba2cd0b09.zip
runqemu: add user mode (SLIRP) support to x86 QEMU targets
Using 'slirp' as a command line option to runqemu will start QEMU with user mode networking instead of creating tun/tap devices. SLIRP does not require root access. By default port 2222 on the host will be mapped to port 22 in the guest. The default port mapping can be overwritten with the QB_SLIRP_OPT variable e.g. QB_SLIRP_OPT = "-net nic,model=e1000 -net user,hostfwd=tcp::2222-:22" Signed-off-by: Todor Minchev <todor.minchev@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc1
-rwxr-xr-xscripts/runqemu3
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index 06ac983d4d..08702948e4 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -13,3 +13,4 @@ QB_AUDIO_OPT = "-soundhw ac97,es1370"
QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
+QB_SLIRP_OPT = "-net nic,model=e1000 -net user,hostfwd=tcp::2222-:22"
diff --git a/scripts/runqemu b/scripts/runqemu
index dbe17abfc5..6952f3210b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -542,7 +542,8 @@ class BaseConfig(object):
def check_and_set(self):
"""Check configs sanity and set when needed"""
self.validate_paths()
- check_tun()
+ if not self.slirp_enabled:
+ check_tun()
# Check audio
if self.audio_enabled:
if not self.get('QB_AUDIO_DRV'):