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-22 00:31:49 +0100 |
commit | 87661cbe0ce8c6f7a66bba2d26f0e6aa2f3f41c8 (patch) | |
tree | e9ea182a3f1f33596686b9c09ad6dc9ef56644b5 /meta | |
parent | afb311001c6a8f911fd8b794afced0cb7808ac82 (diff) | |
download | poky-87661cbe0ce8c6f7a66bba2d26f0e6aa2f3f41c8.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: 7d4450d373a297f246b8c3708fd7d2cafadd3ae9)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 1868ad3206..b98b183504 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py | |||
@@ -159,7 +159,7 @@ class QemuTarget(BaseTarget): | |||
159 | 159 | ||
160 | def start(self, params=None, ssh=True, extra_bootparams='', runqemuparams='', launch_cmd='', discard_writes=True): | 160 | def start(self, params=None, ssh=True, extra_bootparams='', runqemuparams='', launch_cmd='', discard_writes=True): |
161 | if launch_cmd: | 161 | if launch_cmd: |
162 | start = self.runner.launch(get_ip=ssh, launch_cmd=launch_cmd) | 162 | start = self.runner.launch(get_ip=ssh, launch_cmd=launch_cmd, qemuparams=params) |
163 | else: | 163 | else: |
164 | start = self.runner.start(params, get_ip=ssh, extra_bootparams=extra_bootparams, runqemuparams=runqemuparams, discard_writes=discard_writes) | 164 | start = self.runner.start(params, get_ip=ssh, extra_bootparams=extra_bootparams, runqemuparams=runqemuparams, discard_writes=discard_writes) |
165 | 165 | ||