summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@xilinx.com>2017-03-24 13:38:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:28 +0100
commit7243c21bf89061c5304753583c87bec9090c89f3 (patch)
tree59d9793f42247ee384f0309e0cb96f95c0ea29f0
parentef8c15852cecb467cd2ebbec11b4df4bdd21ab68 (diff)
downloadpoky-7243c21bf89061c5304753583c87bec9090c89f3.tar.gz
runqemu: Automatically add a TFTP directory for slirp boot
When booting QEMU with slirp networking we want to use QEMUs TFTP server to make the images in deploy accessible to the guest. (From OE-Core rev: a6bef2fa065f8bb74d0084e44dd0ca47d7859113) Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index f0ddeea1bf..72c4176b72 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -844,7 +844,7 @@ class BaseConfig(object):
844 self.kernel_cmdline_script += ' ip=dhcp' 844 self.kernel_cmdline_script += ' ip=dhcp'
845 # Port mapping 845 # Port mapping
846 hostfwd = ",hostfwd=tcp::2222-:22,hostfwd=tcp::2323-:23" 846 hostfwd = ",hostfwd=tcp::2222-:22,hostfwd=tcp::2323-:23"
847 qb_slirp_opt_default = "-netdev user,id=net0%s" % hostfwd 847 qb_slirp_opt_default = "-netdev user,id=net0%s,tftp=%s" % (hostfwd, self.get('DEPLOY_DIR_IMAGE'))
848 qb_slirp_opt = self.get('QB_SLIRP_OPT') or qb_slirp_opt_default 848 qb_slirp_opt = self.get('QB_SLIRP_OPT') or qb_slirp_opt_default
849 # Figure out the port 849 # Figure out the port
850 ports = re.findall('hostfwd=[^-]*:([0-9]+)-[^,-]*', qb_slirp_opt) 850 ports = re.findall('hostfwd=[^-]*:([0-9]+)-[^,-]*', qb_slirp_opt)