diff options
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index cd60ba71a3..54312fb94c 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -55,7 +55,7 @@ class QemuRunner: | |||
55 | self.thread = None | 55 | self.thread = None |
56 | self.use_kvm = use_kvm | 56 | self.use_kvm = use_kvm |
57 | 57 | ||
58 | self.runqemutime = 60 | 58 | self.runqemutime = 120 |
59 | self.host_dumper = HostDumper(dump_host_cmds, dump_dir) | 59 | self.host_dumper = HostDumper(dump_host_cmds, dump_dir) |
60 | 60 | ||
61 | def create_socket(self): | 61 | def create_socket(self): |
@@ -204,7 +204,7 @@ class QemuRunner: | |||
204 | out = self.getOutput(output) | 204 | out = self.getOutput(output) |
205 | netconf = False # network configuration is not required by default | 205 | netconf = False # network configuration is not required by default |
206 | if self.is_alive(): | 206 | if self.is_alive(): |
207 | logger.info("qemu started - qemu procces pid is %s" % self.qemupid) | 207 | logger.info("qemu started in %s seconds - qemu procces pid is %s" % (time.time() - (endtime - self.runqemutime), self.qemupid)) |
208 | if get_ip: | 208 | if get_ip: |
209 | cmdline = '' | 209 | cmdline = '' |
210 | with open('/proc/%s/cmdline' % self.qemupid) as p: | 210 | with open('/proc/%s/cmdline' % self.qemupid) as p: |
@@ -317,10 +317,14 @@ class QemuRunner: | |||
317 | logger.info("Serial console failed while trying to login") | 317 | logger.info("Serial console failed while trying to login") |
318 | 318 | ||
319 | else: | 319 | else: |
320 | logger.info("Qemu pid didn't appeared in %s seconds" % self.runqemutime) | 320 | logger.error("Qemu pid didn't appear in %s seconds" % self.runqemutime) |
321 | self._dump_host() | 321 | self._dump_host() |
322 | self.stop() | 322 | self.stop() |
323 | logger.info("Output from runqemu:\n%s" % self.getOutput(output)) | 323 | op = self.getOutput(output) |
324 | if op: | ||
325 | logger.error("Output from runqemu:\n%s" % op) | ||
326 | else: | ||
327 | logger.error("No output from runqemu.\n") | ||
324 | return False | 328 | return False |
325 | 329 | ||
326 | return self.is_alive() | 330 | return self.is_alive() |