[dts] [PATCH 1/2] framework/qemu_kvm: fix vm control session failure

[Phil Yang <phil.yang@arm.com>]

For telnet vm control, it will continuously fail to login to vm when
it doesn't read login prompt during first time connection. So extend
the connection time to get more output each time.

For socket vm control, added LOGIN_PROMPT into the login status
check for other platform.
Keep the connection longer to avoid failure and reconnection.

Signed-off-by: Phil Yang <phil.yang@arm.com>
---
 framework/qemu_kvm.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py
index ec33669..57d16f6 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
@@ -987,7 +987,7 @@ class QEMUKvm(VirtBase):
                 self.control_session.send_command("nc -U %s" % self.serial_path)
 
             # login message not ouput if timeout too small
-            out = self.control_session.send_command("", timeout=5).replace('\r', '').replace('\n', '')
+            out = self.control_session.send_command("", timeout=15).replace('\r', '').replace('\n', '')
 
             if len(out) == 0:
                 raise StartVMFailedException("Can't get output from [%s:%s]" % (self.host_dut.crb['My IP'], self.vm_name))
@@ -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:
@@ -1034,9 +1034,10 @@ class QEMUKvm(VirtBase):
                 self.control_session = self.host_session
 
                 self.control_session.send_expect("telnet localhost %d" % self.serial_port, "Connected to localhost", timeout=self.OPERATION_TIMEOUT)
+                time.sleep(5)
 
             # output will be empty if timeout too small
-            out = self.control_session.send_command("", timeout=5).replace('\r', '').replace('\n', '')
+            out = self.control_session.send_command("", timeout=10).replace('\r', '').replace('\n', '')
 
             # if no output from serial port, either connection close or system hang
             if len(out) == 0:
@@ -1058,7 +1059,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