[dts] [PATCH V1 4/5]framework/qemu_kvm: remove cat command
Xiao Qimai
qimaix.xiao at intel.com
Tue Jun 30 11:46:37 CEST 2020
Signed-off-by: Xiao Qimai <qimaix.xiao at intel.com>
---
framework/qemu_kvm.py | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py
index 421ee3e..757737e 100644
--- a/framework/qemu_kvm.py
+++ b/framework/qemu_kvm.py
@@ -1829,11 +1829,6 @@ class QEMUKvm(VirtBase):
if self.control_type == "qga":
# wait few seconds for network ready
time.sleep(5)
- # before get the ip, check the ssh service is ok
- # if the ssh service if ready, the file /run/sshd.pid will store the pid
- out = self.control_session.send_expect(self.qga_cmd_head + "cat /run/sshd.pid" , "#", timeout=self.OPERATION_TIMEOUT)
- if out == '':
- return "Failed"
out = self.control_session.send_expect(self.qga_cmd_head + "ifconfig" , "#", timeout=self.OPERATION_TIMEOUT)
else:
pci = "00:1f.0"
@@ -1843,10 +1838,6 @@ class QEMUKvm(VirtBase):
if self.nic_model == "virtio":
pci += "/virtio*/"
- # before get the ip, check the ssh service is ok
- out = self.control_session.send_expect("ls /run/sshd.pid", "# ", timeout=self.OPERATION_TIMEOUT, verify=True)
- if isinstance(out, int):
- return "Failed"
intf = self.control_session.send_expect("ls -1 /sys/bus/pci/devices/0000:%s/net" %pci, "#", timeout=self.OPERATION_TIMEOUT)
out = self.control_session.send_expect("ifconfig %s" % intf, "#", timeout=self.OPERATION_TIMEOUT)
if "10.0.2" not in out:
--
1.8.3.1
More information about the dts
mailing list