From: Wei Ling <weix.ling@intel.com>
To: dts@dpdk.org
Cc: Wei Ling <weix.ling@intel.com>
Subject: [dts][PATCH V2] tests/*: use the same qemu config to start VM
Date: Tue, 13 Dec 2022 15:40:45 +0800 [thread overview]
Message-ID: <20221213074045.3357158-1-weix.ling@intel.com> (raw)
Use the same QEMU config file to start VM as soon as possible so that
can maintain fewer config file.
Signed-off-by: Wei Ling <weix.ling@intel.com>
---
conf/vhost_virtio_pmd_interrupt.cfg | 14 --------------
tests/TestSuite_pvp_diff_qemu_version.py | 2 +-
tests/TestSuite_pvp_vhost_user_reconnect.py | 2 +-
tests/TestSuite_vhost_event_idx_interrupt.py | 2 +-
tests/TestSuite_vhost_virtio_pmd_interrupt.py | 2 +-
5 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 conf/vhost_virtio_pmd_interrupt.cfg
diff --git a/conf/vhost_virtio_pmd_interrupt.cfg b/conf/vhost_virtio_pmd_interrupt.cfg
deleted file mode 100644
index bd76f920..00000000
--- a/conf/vhost_virtio_pmd_interrupt.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration sample: vhost_sample.cfg
-[vm0]
-cpu =
- model=host,number=4,cpupin=4 5;
-mem =
- size=8192,hugepage=yes;
-disk =
- file=/home/img/noiommu-vm.img;
-login =
- user=root,password=tester;
-vnc =
- displayNum=4;
-daemon =
- enable=yes;
diff --git a/tests/TestSuite_pvp_diff_qemu_version.py b/tests/TestSuite_pvp_diff_qemu_version.py
index c62a22a9..02682815 100644
--- a/tests/TestSuite_pvp_diff_qemu_version.py
+++ b/tests/TestSuite_pvp_diff_qemu_version.py
@@ -171,7 +171,7 @@ class TestVhostPVPDiffQemuVersion(TestCase):
"""
start vm
"""
- self.vm = VM(self.dut, "vm0", "pvp_diff_qemu_version")
+ self.vm = VM(self.dut, "vm0", self.suite_name)
vm_params = {}
vm_params["driver"] = "vhost-user"
vm_params["opt_path"] = "%s/vhost-net" % self.base_dir
diff --git a/tests/TestSuite_pvp_vhost_user_reconnect.py b/tests/TestSuite_pvp_vhost_user_reconnect.py
index 646a9202..93006413 100644
--- a/tests/TestSuite_pvp_vhost_user_reconnect.py
+++ b/tests/TestSuite_pvp_vhost_user_reconnect.py
@@ -160,7 +160,7 @@ class TestPVPVhostUserReconnect(TestCase):
if packed is True:
setting_args = "%s,packed=on" % setting_args
for i in range(self.vm_num):
- vm_info = VM(self.dut, "vm%d" % i, "vhost_sample_copy")
+ vm_info = VM(self.dut, "vm%d" % i, "vhost_sample")
vm_params = {}
vm_params["driver"] = "vhost-user"
vm_params["opt_path"] = "./vhost-net%d" % (i)
diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py b/tests/TestSuite_vhost_event_idx_interrupt.py
index f3951c5c..2784729e 100644
--- a/tests/TestSuite_vhost_event_idx_interrupt.py
+++ b/tests/TestSuite_vhost_event_idx_interrupt.py
@@ -171,7 +171,7 @@ class TestVhostEventIdxInterrupt(TestCase):
start qemus
"""
for i in range(vm_num):
- vm_info = VM(self.dut, "vm%d" % i, "vhost_sample_copy")
+ vm_info = VM(self.dut, "vm%d" % i, "vhost_sample")
vm_info.load_config()
vm_params = {}
vm_params["driver"] = "vhost-user"
diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt.py b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
index cfef63fa..a1f3e8dd 100644
--- a/tests/TestSuite_vhost_virtio_pmd_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
@@ -154,7 +154,7 @@ class TestVhostVirtioPmdInterrupt(TestCase):
"""
start qemus
"""
- self.vm = VM(self.dut, "vm0", self.suite_name)
+ self.vm = VM(self.dut, "vm0", "vhost_sample")
self.vm.load_config()
vm_params = {}
vm_params["driver"] = "vhost-user"
--
2.25.1
next reply other threads:[~2022-12-13 7:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 7:40 Wei Ling [this message]
2022-12-13 7:51 ` He, Xingguang
2022-12-22 8:59 ` lijuan.tu
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=20221213074045.3357158-1-weix.ling@intel.com \
--to=weix.ling@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).