diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 1c57efaaef..d3b49b770a 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py | |||
@@ -174,8 +174,8 @@ class QemuTarget(BaseTarget): | |||
174 | bb.note("Qemu log file: %s" % self.qemulog) | 174 | bb.note("Qemu log file: %s" % self.qemulog) |
175 | super(QemuTarget, self).deploy() | 175 | super(QemuTarget, self).deploy() |
176 | 176 | ||
177 | def start(self, params=None, ssh=True): | 177 | def start(self, params=None, ssh=True, extra_bootparams=None): |
178 | if self.runner.start(params, get_ip=ssh): | 178 | if self.runner.start(params, get_ip=ssh, extra_bootparams=extra_bootparams): |
179 | if ssh: | 179 | if ssh: |
180 | self.ip = self.runner.ip | 180 | self.ip = self.runner.ip |
181 | self.server_ip = self.runner.server_ip | 181 | self.server_ip = self.runner.server_ip |
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index b8ac3f0bb6..df73120254 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -92,7 +92,7 @@ class QemuRunner: | |||
92 | self._dump_host() | 92 | self._dump_host() |
93 | raise SystemExit | 93 | raise SystemExit |
94 | 94 | ||
95 | def start(self, qemuparams = None, get_ip = True): | 95 | def start(self, qemuparams = None, get_ip = True, extra_bootparams = None): |
96 | if self.display: | 96 | if self.display: |
97 | os.environ["DISPLAY"] = self.display | 97 | os.environ["DISPLAY"] = self.display |
98 | # Set this flag so that Qemu doesn't do any grabs as SDL grabs | 98 | # Set this flag so that Qemu doesn't do any grabs as SDL grabs |
@@ -120,7 +120,11 @@ class QemuRunner: | |||
120 | return False | 120 | return False |
121 | 121 | ||
122 | 122 | ||
123 | self.qemuparams = 'bootparams="console=tty1 console=ttyS0,115200n8 printk.time=1" qemuparams="-serial tcp:127.0.0.1:{}"'.format(threadport) | 123 | bootparams = 'console=tty1 console=ttyS0,115200n8 printk.time=1' |
124 | if extra_bootparams: | ||
125 | bootparams = bootparams + ' ' + extra_bootparams | ||
126 | |||
127 | self.qemuparams = 'bootparams="{0}" qemuparams="-serial tcp:127.0.0.1:{1}"'.format(bootparams, threadport) | ||
124 | if not self.display: | 128 | if not self.display: |
125 | self.qemuparams = 'nographic ' + self.qemuparams | 129 | self.qemuparams = 'nographic ' + self.qemuparams |
126 | if qemuparams: | 130 | if qemuparams: |