[oe-commits] [openembedded-core] 64/84: runqemu: add user mode (SLIRP) support to x86 QEMU targets

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 012c4382f7bdc193d4d30fe879e26bea5d4ad959
Author: Todor Minchev <todor.minchev at linux.intel.com>
AuthorDate: Wed Oct 26 10:05:59 2016 -0700

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/conf/machine/include/qemuboot-x86.inc | 1 +
 scripts/runqemu                            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index 06ac983..0870294 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 dbe17ab..6952f32 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'):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.