summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/qemurunner.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-15 09:06:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-15 09:11:47 +0100
commitddd38a3b1562b6c5b74c1e8e23c2e5c9b38bc4a2 (patch)
treeba3d368dc8918deedd47a35f2f08607ee4620429 /meta/lib/oeqa/utils/qemurunner.py
parentb233e2f8c2d756010fd4fae5b8173b1fddf39693 (diff)
downloadpoky-ddd38a3b1562b6c5b74c1e8e23c2e5c9b38bc4a2.tar.gz
oeqa/qemurunner: Drop newlines serial workaround
Drop the newlines serial workaround, it doesn't seem to fix things enough of the time to be useful. (From OE-Core rev: 6cd57b2d148c5de7839d52d8cec359e4a10e0cd6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index a52fa41768..29fe271976 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -445,11 +445,9 @@ class QemuRunner:
445 self.logger.debug("Waiting at most %d seconds for login banner (%s)" % 445 self.logger.debug("Waiting at most %d seconds for login banner (%s)" %
446 (self.boottime, time.strftime("%D %H:%M:%S"))) 446 (self.boottime, time.strftime("%D %H:%M:%S")))
447 endtime = time.time() + self.boottime 447 endtime = time.time() + self.boottime
448 newlinetime = time.time() + 120
449 filelist = [self.server_socket, self.runqemu.stdout] 448 filelist = [self.server_socket, self.runqemu.stdout]
450 reachedlogin = False 449 reachedlogin = False
451 stopread = False 450 stopread = False
452 sentnewlines = False
453 qemusock = None 451 qemusock = None
454 bootlog = b'' 452 bootlog = b''
455 data = b'' 453 data = b''
@@ -458,16 +456,6 @@ class QemuRunner:
458 sread, swrite, serror = select.select(filelist, [], [], 5) 456 sread, swrite, serror = select.select(filelist, [], [], 5)
459 except InterruptedError: 457 except InterruptedError:
460 continue 458 continue
461 # With the 6.5 kernel, the serial port getty sometimes fails to appear, the data
462 # appears lost in some buffer somewhere. Wait two minutes, then if we've not had a login,
463 # try and provoke one. This is a workaround until we can work out the root cause.
464 if time.time() > newlinetime and not sentnewlines:
465 self.logger.warning('Probing the serial port to wake it up!')
466 try:
467 self.server_socket.sendall(bytes("\n\n", "utf-8"))
468 sentnewlines = True
469 except BrokenPipeError as e:
470 self.logger.debug('Probe failed %s' % repr(e))
471 for file in sread: 459 for file in sread:
472 if file is self.server_socket: 460 if file is self.server_socket:
473 qemusock, addr = self.server_socket.accept() 461 qemusock, addr = self.server_socket.accept()