diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-05-13 11:12:46 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-15 17:53:29 +0100 |
commit | d0d0d3e20f63ea29bcd6234ddefe2f390ddbdad1 (patch) | |
tree | 6b59019da5d22552e4d855bea185c06c3d8d4f76 /meta/lib | |
parent | a98ac2a39b30b3a3e94669616900547b0b87992a (diff) | |
download | poky-d0d0d3e20f63ea29bcd6234ddefe2f390ddbdad1.tar.gz |
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
(From OE-Core rev: 4f0a576fd5b9373cff4ca5ac92ec6af29499df89)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index c742d4759a..15e617c95a 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py | |||
@@ -161,7 +161,7 @@ class QemuTarget(BaseTarget): | |||
161 | 161 | ||
162 | def start(self, params=None, ssh=True, extra_bootparams='', runqemuparams='', launch_cmd='', discard_writes=True): | 162 | def start(self, params=None, ssh=True, extra_bootparams='', runqemuparams='', launch_cmd='', discard_writes=True): |
163 | if launch_cmd: | 163 | if launch_cmd: |
164 | start = self.runner.launch(get_ip=ssh, launch_cmd=launch_cmd) | 164 | start = self.runner.launch(get_ip=ssh, launch_cmd=launch_cmd, qemuparams=params) |
165 | else: | 165 | else: |
166 | start = self.runner.start(params, get_ip=ssh, extra_bootparams=extra_bootparams, runqemuparams=runqemuparams, discard_writes=discard_writes) | 166 | start = self.runner.start(params, get_ip=ssh, extra_bootparams=extra_bootparams, runqemuparams=runqemuparams, discard_writes=discard_writes) |
167 | 167 | ||