From: Phil Yang <phil.yang@arm.com>
To: dts@dpdk.org
Cc: nd@arm.com, yong.liu@intel.com
Subject: [dts] [PATCH v2] framework/qemu_kvm: fix vm control session failure
Date: Thu, 17 May 2018 18:31:04 +0800 [thread overview]
Message-ID: <1526553064-19939-1-git-send-email-phil.yang@arm.com> (raw)
In-Reply-To: <1526378779-10530-1-git-send-email-phil.yang@arm.com>
Fix telnet socket vm control shell_reg mismatch issue.
For socket vm control, added LOGIN_PROMPT into the login status
check for other platform.
Jira: ENTNET-773
Change-Id: I95fbb8b25563b706e6dc06217033d68aa3c76486
Signed-off-by: Phil Yang <phil.yang@arm.com>
---
framework/qemu_kvm.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py
index ec33669..89518a7 100644
--- a/framework/qemu_kvm.py
+++ b/framework/qemu_kvm.py
@@ -979,7 +979,7 @@ class QEMUKvm(VirtBase):
Connect to serial port and return connected session for usage
if connected failed will return None
"""
- shell_reg = r"(\s*)\[(.*)\]# "
+ shell_reg = r"(.*)# "
try:
if getattr(self, 'control_session', None) is None:
self.control_session = self.host_session
@@ -1025,7 +1025,7 @@ class QEMUKvm(VirtBase):
Connect to serial port and return connected session for usage
if connected failed will return None
"""
- shell_reg = r"(\s*)\[(.*)\]# "
+ shell_reg = r"(.*)# "
scan_cmd = "lsof -i:%d | grep telnet | awk '{print $2}'" % self.serial_port
try:
@@ -1058,7 +1058,7 @@ class QEMUKvm(VirtBase):
return True
# login into Redhat os, not sure can work on all distributions
- if "x86_64 on an x86_64" not in out:
+ if ("x86_64 on an x86_64" not in out) and (self.LOGIN_PROMPT not in out):
print RED("[%s:%s] not ready for login" % (self.host_dut.crb['My IP'], self.vm_name))
return False
else:
--
2.7.4
next prev parent reply other threads:[~2018-05-17 10:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 10:06 [dts] [PATCH 1/2] " Phil Yang
2018-05-15 10:06 ` [dts] [PATCH 2/2] framework/qemu_kvm: replace nc with socat for vm control by socket Phil Yang
2018-05-25 8:37 ` [dts] [PATCH v2] " Phil Yang
2018-05-25 16:31 ` Liu, Yong
2018-05-16 1:37 ` [dts] [PATCH 1/2] framework/qemu_kvm: fix vm control session failure Liu, Yong
2018-05-16 3:55 ` Phil Yang
2018-05-16 5:01 ` Liu, Yong
2018-05-16 5:22 ` Phil Yang
2018-05-16 6:37 ` Liu, Yong
2018-05-17 10:16 ` Phil Yang
2018-05-17 10:31 ` Phil Yang [this message]
2018-05-18 5:11 ` [dts] [PATCH v2] " Liu, Yong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1526553064-19939-1-git-send-email-phil.yang@arm.com \
--to=phil.yang@arm.com \
--cc=dts@dpdk.org \
--cc=nd@arm.com \
--cc=yong.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).