From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 28 Nov 2022 10:46:32 +0000 (+0100)
Subject: runqemu: do not hardcode the ip address of the nfs server when using tap
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2390
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5e2ef31b151825613b62e58034e81f72526a944;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

runqemu: do not hardcode the ip address of the nfs server when using tap

Rather, set it similarly to the overall network config.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/scripts/runqemu b/scripts/runqemu
index 7bd9465593e..04728673dea 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -999,7 +999,7 @@ class BaseConfig(object):
             if self.slirp_enabled:
                 self.nfs_server = '10.0.2.2'
             else:
-                self.nfs_server = '192.168.7.1'
+                self.nfs_server = '192.168.7.@GATEWAY@'
 
         # Figure out a new nfs_instance to allow multiple qemus running.
         ps = subprocess.check_output(("ps", "auxww")).decode('utf-8')
@@ -1187,6 +1187,7 @@ class BaseConfig(object):
         netconf = " " + self.cmdline_ip_tap
         netconf = netconf.replace('@CLIENT@', str(client))
         netconf = netconf.replace('@GATEWAY@', str(gateway))
+        self.nfs_server = self.nfs_server.replace('@GATEWAY@', str(gateway))
         logger.info("Network configuration:%s", netconf)
         self.kernel_cmdline_script += netconf
         mac = "%s%02x" % (self.mac_tap, client)