[oe-commits] [openembedded-core] 23/30: oeqa/utils/qemurunner: Set both the threadport&serverport with tcpserial parameter

git at git.openembedded.org git at git.openembedded.org
Tue Jun 18 10:31:55 UTC 2019

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch warrior
in repository openembedded-core.

commit 1ffea0c0fb3688f3cee0a5fa741e969581d01bd3
Author: Kevin Hao <kexin.hao at windriver.com>
AuthorDate: Thu Jun 6 15:11:47 2019 +0800

    oeqa/utils/qemurunner: Set both the threadport&serverport with tcpserial parameter
    After the commit ad522ea6a64e ("runqemu: Let qemuparams override default
    settings"), the order of the two "-serial" parameters when running the
    qemu have been switched. The effect of this is that the logging thread
    will use ttyS1 (of course can't capture the kernel boot message anymore),
    and the test command will run on the ttyS0. So the output of the test
    command may be mangled by the kernel message (such as call trace), and
    let the test command produce a fake timeout error message. We can't fix
    it by just adjusting the order of the threadport and serverport, since
    it will break some machines such as qemuarm64 which use the virtio
    serial. So using the tcpserial to setup both the threadport and
    [YOCTO Bug 13309]
    Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
 meta/lib/oeqa/utils/qemurunner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index fd386ef..6d2860c 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -155,11 +155,11 @@ class QemuRunner:
         # and analyze descendents in order to determine it.
         if os.path.exists(self.qemu_pidfile):
-        self.qemuparams = 'bootparams="{0}" qemuparams="-serial tcp:{1} -pidfile {2}"'.format(bootparams, threadport, self.qemu_pidfile)
+        self.qemuparams = 'bootparams="{0}" qemuparams="-pidfile {1}"'.format(bootparams, self.qemu_pidfile)
         if qemuparams:
             self.qemuparams = self.qemuparams[:-1] + " " + qemuparams + " " + '\"'
-        launch_cmd += ' tcpserial=%s %s' % (self.serverport, self.qemuparams)
+        launch_cmd += ' tcpserial=%s:%s %s' % (threadport, self.serverport, self.qemuparams)
         self.origchldhandler = signal.getsignal(signal.SIGCHLD)
         signal.signal(signal.SIGCHLD, self.handleSIGCHLD)

To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the Openembedded-commits mailing list