From patchwork Tue Dec 13 07:40:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 120801 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 00E99A0540; Tue, 13 Dec 2022 08:48:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFDF04021D; Tue, 13 Dec 2022 08:48:12 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 7B87A40146 for ; Tue, 13 Dec 2022 08:48:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670917691; x=1702453691; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=BQQBaRzypGQF9RL1k89/zq96dNZ4Qf1ohYiBSgJGfAw=; b=W+UG6allmpslJn0xshCxVZQAwzUnFlSiB17v6sYacht2bpb0dIoEVHs3 lrITFn4iFS6QfWaJ7jXq6JZjsEm9zgpVn/ruNYx/Jib6VQ2nCig+BceRb vQuNW9Ww6WMyOAzYXRHSiYE4esXi9UWY4gin7WS5n26jw5wH3aTGSJscp aNxJuh7OIgejvLhWLJ88R7z8A/G0KjIRktuJjWsaJM/hHpEUlVJnoQWd6 ik1MD7Fm8q4yAlVZcgLgmo6XBYcT5KtBAD86UUggm6lBP+XJ438Gb1zC+ lgIGwnMYgbYEvanrMWQkwDFYPU/K7GZXVInt54bQglDHLsDAZsHvzHl13 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="319212615" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="319212615" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 23:48:10 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="822785348" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="822785348" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 23:48:09 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V2] tests/*: use the same qemu config to start VM Date: Tue, 13 Dec 2022 15:40:45 +0800 Message-Id: <20221213074045.3357158-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org 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 Acked-by: Xingguang He Acked-by: Lijuan Tu --- 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"