[dts][PATCH V2] tests/*: use the same qemu config to start VM

[dts][PATCH V2] tests/*: use the same qemu config to start VM

[Wei Ling]

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

RE: [dts][PATCH V2] tests/*: use the same qemu config to start VM

[He, Xingguang]

> -----Original Message-----
> From: Wei Ling <weix.ling@intel.com>
> Sent: Tuesday, December 13, 2022 3:41 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V2] tests/*: use the same qemu config to start VM
> 
> 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>
> ---

Acked-by: Xingguang He<xingguang.he@intel.com>

[dts][PATCH V2] tests/*: use the same qemu config to start VM

[lijuan.tu]

On Tue, 13 Dec 2022 15:40:45 +0800, Wei Ling <weix.ling@intel.com> wrote:
> 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>

Acked-by: Lijuan Tu <lijuan.tu@intel.com>
Applied, thanks