summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@windriver.com>2021-06-18 09:03:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-22 15:18:11 +0100
commitab507fad575fb1c822c117e6a8347f6566f7a244 (patch)
tree8c91fd8cd8d63e169a7269219d8633f45ded57bd
parentbb30baceecee69f095104c7a350830f2bf277881 (diff)
downloadpoky-ab507fad575fb1c822c117e6a8347f6566f7a244.tar.gz
qemurunner: add second qmp port
This will allow for direct ssh connection without breaking the first one that is used for monitoring. The "nowait" option will cause qmp server connection to NOT block waiting. (From OE-Core rev: 40f09e184afd42decf2f924896fef03beacddc4b) Signed-off-by: Saul Wold <saul.wold@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 5dc1a136e3..abbc7f7d1f 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -192,6 +192,12 @@ class QemuRunner:
192 qmp_file = "." + next(tempfile._get_candidate_names()) 192 qmp_file = "." + next(tempfile._get_candidate_names())
193 qmp_param = ' -S -qmp unix:./%s,server,wait' % (qmp_file) 193 qmp_param = ' -S -qmp unix:./%s,server,wait' % (qmp_file)
194 qmp_port = self.tmpdir + "/" + qmp_file 194 qmp_port = self.tmpdir + "/" + qmp_file
195 # Create a second socket connection for debugging use,
196 # note this will NOT cause qemu to block waiting for the connection
197 qmp_file2 = "." + next(tempfile._get_candidate_names())
198 qmp_param += ' -qmp unix:./%s,server,nowait' % (qmp_file2)
199 qmp_port2 = self.tmpdir + "/" + qmp_file2
200 self.logger.info("QMP Available for connection at %s" % (qmp_port2))
195 201
196 try: 202 try:
197 if self.serial_ports >= 2: 203 if self.serial_ports >= 2: