From: Hongxu Jia Date: Mon, 13 May 2019 15:12:46 +0000 (-0400) Subject: oeqa/targetcontrol.py: fix qemuparams not work in runqemu with launch_cmd X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~14513 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f0a576fd5b9373cff4ca5ac92ec6af29499df89;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oeqa/targetcontrol.py: fix qemuparams not work in runqemu with launch_cmd As runqemu with launch_cmd means directly run the command, don't need set rootfs or env vars. Since commit [a847dd7202 runqemu: Let qemuparams override default settings] applied in oe-core, if launch_cmd contains "qemuparams='***'", it does not work, which is overridden by latter qemuparams="-serial tcp:127.0.0.1" in QemuRunner.launch(); So we set qemuparams as a parameter in runqemu, the fix makes it work Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index c742d4759a0..15e617c95a9 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -161,7 +161,7 @@ class QemuTarget(BaseTarget): def start(self, params=None, ssh=True, extra_bootparams='', runqemuparams='', launch_cmd='', discard_writes=True): if launch_cmd: - start = self.runner.launch(get_ip=ssh, launch_cmd=launch_cmd) + start = self.runner.launch(get_ip=ssh, launch_cmd=launch_cmd, qemuparams=params) else: start = self.runner.start(params, get_ip=ssh, extra_bootparams=extra_bootparams, runqemuparams=runqemuparams, discard_writes=discard_writes)