From: Xiao Qimai <qimaix.xiao@intel.com>
To: dts@dpdk.org
Cc: Xiao Qimai <qimaix.xiao@intel.com>
Subject: [dts] [PATCH V1 4/5]framework/qemu_kvm: remove cat command
Date: Tue, 30 Jun 2020 17:46:37 +0800 [thread overview]
Message-ID: <1593510398-51509-5-git-send-email-qimaix.xiao@intel.com> (raw)
In-Reply-To: <1593510398-51509-1-git-send-email-qimaix.xiao@intel.com>
Signed-off-by: Xiao Qimai <qimaix.xiao@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
next prev parent reply other threads:[~2020-06-30 9:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 9:46 [dts] [PATCH V1 0/5] update framework to support vfio-pci and new version of OS Xiao Qimai
2020-06-30 9:46 ` [dts] [PATCH V1 1/5]conf/virt_global.cfg: vfio-pci should be loaded with noiommu mode in vm Xiao Qimai
2020-06-30 9:46 ` [dts] [PATCH V1 2/5]framework/dut.py: update method of restore_interfaces_linux Xiao Qimai
2020-06-30 9:46 ` [dts] [PATCH V1 3/5]framework/project_dpdk: update method setup_modules_linux for vfio-pci in vm Xiao Qimai
2020-06-30 9:46 ` Xiao Qimai [this message]
2020-06-30 9:46 ` [dts] [PATCH V1 5/5]framework/ssh_pexpect: add retry when connect to vm Xiao Qimai
2020-06-30 9:56 ` [dts] [PATCH V1 0/5] update framework to support vfio-pci and new version of OS Xiao, QimaiX
2020-07-01 6:19 ` Tu, Lijuan
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=1593510398-51509-5-git-send-email-qimaix.xiao@intel.com \
--to=qimaix.xiao@intel.com \
--cc=dts@dpdk.org \
/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).