summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86-64.conf
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-08-20 13:01:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-24 23:47:07 +0100
commitfd164dcc31aa6c60e9834036a7cfcea5411daa3d (patch)
tree5f1b1395e7edbd9ff689fcf48f3baea5a2599c6c /meta/conf/machine/qemux86-64.conf
parent8d05d8a0c46564784463d2a39c68c467714f306d (diff)
downloadpoky-fd164dcc31aa6c60e9834036a7cfcea5411daa3d.tar.gz
qemurunner: Use two serial ports and log console with a thread
qemu can freeze and stop responding if the socket buffer connected to a tcp serial connection fills up. This happens of course when the reader of the serial data doesn't actually read it. This happened in the qemurunner code, because after checking for the "login:" sentinel, data was never again read from the serial connection. This patch solves the potential freeze by adding a thread to continuously read the data from the console and log it. So it also will give a full log of the console, rather than just up to the login prompt. To simplify this patch, another serial port was also added to use for the sole purpose of watching for the sentinel as well as being the interactive serial port. This will also prevent the possibility of lots of debug data on the console preventing the sentinel value from being seen due to interleaved text. (From OE-Core rev: 2da3fee6b6d9f4dd4c4cb529f4ba393c20aa0f13) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/qemux86-64.conf')
-rw-r--r--meta/conf/machine/qemux86-64.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 837f9f4ab0..a4fd43ce1a 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-core2.inc
13 13
14KERNEL_IMAGETYPE = "bzImage" 14KERNEL_IMAGETYPE = "bzImage"
15 15
16SERIAL_CONSOLE = "115200 ttyS0" 16SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
17 17
18XSERVER = "xserver-xorg \ 18XSERVER = "xserver-xorg \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \