From nobody Sun May 5 22:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617912460; cv=none; d=zohomail.com; s=zohoarc; b=F/xomrvxW+KTXiuRfrXJYzOGEq3kUwvTryPr4VkQQDXNLA3h6s7iPwNqRnYYauUp4wSLB9yWlKV78GokS+WocLKJsQui0Dzu4ZCispW2SKcHU++ZzL7Yb5BI33iBNO3sNkxf6AY9vqesR/Aokwi7rmaCc/bjeo+bke+DVRtaPOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617912460; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pF0KZ0ZkD3hJ1I3ptMmfpdcQcfmUXaSSEI7NqYXstEs=; b=CQ1/zcTYbfxCyFk9vW5mnhWA1tyFRfrkG1KEaJ4QM3P3amT9LBmHx9UuRvPdwoXRR8qWhhU39RSfWG09HrhlLmF7/pZ1CNHYHr7CocEjFz04UpB/g08meLiB9iOfgFMbH9kcWHSHHJVoFfb3dfbRAtCO1h0Qp83AfzMt+8InKw4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617912460426878.9977283947144; Thu, 8 Apr 2021 13:07:40 -0700 (PDT) Received: from localhost ([::1]:55156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUawF-0003o3-AN for importer@patchew.org; Thu, 08 Apr 2021 16:07:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUauH-00027w-MU for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUauE-0004a9-RD for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-4kI82yjlObygIK31-edWoA-1; Thu, 08 Apr 2021 16:05:32 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07CC0DF884E; Thu, 8 Apr 2021 19:53:06 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-57.gru2.redhat.com [10.97.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 695C36B8DD; Thu, 8 Apr 2021 19:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617912334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pF0KZ0ZkD3hJ1I3ptMmfpdcQcfmUXaSSEI7NqYXstEs=; b=YHzvQ7yb4zSPGfKR1Lbvdn1LMl94+zj82uaat79xB+9iCcXyIh5DP6CVIJjvLjDQ3ZWRjw kF5Hly2NZn1LTkRp7CUzWRdftP1G4s68tvDwnEm28OqJiyhZR6cib2SSrQPoHGAvJ/W3im bwydFt/lBKWHsmDhj7OznMu0cK5rJp4= X-MC-Unique: 4kI82yjlObygIK31-edWoA-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 1/7] tests/acceptance: Automatic set -cpu to the test vm Date: Thu, 8 Apr 2021 16:52:31 -0300 Message-Id: <20210408195237.3489296-2-wainersm@redhat.com> In-Reply-To: <20210408195237.3489296-1-wainersm@redhat.com> References: <20210408195237.3489296-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This introduces a new feature to the functional tests: automatic setting of the '-cpu VALUE' option to the created vm if the test is tagged with 'cpu:VALUE'. The 'cpu' property is made available to the test object as wel= l. For example, for a simple test as: def test(self): """ :avocado: tags=3Dcpu:host """ self.assertEqual(self.cpu, "host") self.vm.launch() The resulting QEMU evocation will be like: qemu-system-x86_64 -display none -vga none -chardev socket,id=3Dmon,pat= h=3D/var/tmp/avo_qemu_sock_pdgzbgd_/qemu-1135557-monitor.sock -mon chardev= =3Dmon,mode=3Dcontrol -cpu host Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Cleber Rosa Reviewed-by: Willian Rampazzo Tested-by: Cleber Rosa --- docs/devel/testing.rst | 17 +++++++++++++++++ tests/acceptance/avocado_qemu/__init__.py | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 1da4c4e4c4..e139a618f5 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -878,6 +878,17 @@ name. If one is not given explicitly, it will either = be set to ``None``, or, if the test is tagged with one (and only one) ``:avocado: tags=3Darch:VALUE`` tag, it will be set to ``VALUE``. =20 +cpu +~~~ + +The cpu model that will be set to all QEMUMachine instances created +by the test. + +The ``cpu`` attribute will be set to the test parameter of the same +name. If one is not given explicitly, it will either be set to +``None ``, or, if the test is tagged with one (and only one) +``:avocado: tags=3Dcpu:VALUE`` tag, it will be set to ``VALUE``. + machine ~~~~~~~ =20 @@ -924,6 +935,12 @@ architecture of a kernel or disk image to boot a VM wi= th. This parameter has a direct relation with the ``arch`` attribute. If not given, it will default to None. =20 +cpu +~~~ + +The cpu model that will be set to all QEMUMachine instances created +by the test. + machine ~~~~~~~ =20 diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 83b1741ec8..7f8e703757 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -206,6 +206,9 @@ def setUp(self): self.arch =3D self.params.get('arch', default=3Dself._get_unique_tag_val('ar= ch')) =20 + self.cpu =3D self.params.get('cpu', + default=3Dself._get_unique_tag_val('cpu= ')) + self.machine =3D self.params.get('machine', default=3Dself._get_unique_tag_val(= 'machine')) =20 @@ -231,6 +234,8 @@ def get_vm(self, *args, name=3DNone): name =3D str(uuid.uuid4()) if self._vms.get(name) is None: self._vms[name] =3D self._new_vm(*args) + if self.cpu is not None: + self._vms[name].add_args('-cpu', self.cpu) if self.machine is not None: self._vms[name].set_machine(self.machine) return self._vms[name] --=20 2.29.2 From nobody Sun May 5 22:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617912406; cv=none; d=zohomail.com; s=zohoarc; b=B69c4Cz2Fbu3HolyzJ4QdRBZZX98dkK+9t+wpFXy1EtBKd+ONk+1xTLD+iXpf0YP036WrLtaEyM/ECxsNOFugXiWSU0Ohd+GJ4zGPamwx/lQdo8VsXZUMXxd7rt4tQExjM93XFT3jpbWuAXWGAfAJ+UwMv09EBCF58H+vbtVopM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617912406; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yuMCRqljvnTrL/P43pEjgtJl/mdVzv0CeLAPnU/cNLA=; b=U0SQ9Uav7h3XN78BsYG1UBFolKlxmv2Pil+SDMphAopZiIwLynQYR3MhOY/sXChhMSKF09CJljvXu1CJFa2T5B+A7zlTIjWh/ZnMjAJHuGasBfcHCMId/EEwjd8GSM4XnuXOnF+GyTSPj/O2RcBW+n5E6qi9jQNvtB+CS+F+Buc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161791240650137.77938970422758; Thu, 8 Apr 2021 13:06:46 -0700 (PDT) Received: from localhost ([::1]:53190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUavN-0002zE-Dj for importer@patchew.org; Thu, 08 Apr 2021 16:06:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUatx-0001UL-GC for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUatr-0004L5-ND for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-495-r5wuDlUkPTmSP2wHob9BpA-1; Thu, 08 Apr 2021 16:05:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADD9414B7012; Thu, 8 Apr 2021 19:53:18 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-57.gru2.redhat.com [10.97.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 279B160853; Thu, 8 Apr 2021 19:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617912310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yuMCRqljvnTrL/P43pEjgtJl/mdVzv0CeLAPnU/cNLA=; b=KBQAyTvil3DSsiN+UxtzoEcJqFNWYaMtwo2TEFTWsR8W9k6G0ilBh8OFF1s3Np/35sNFhA /LXizvNm+1zAkZV6PGlAF6Q++gzzCrktg5uw0WDfGz3UjYAun4/je8Dabl4vsmc1b72eJe GQsSDvKekvOY8GB8A4KW2yQAKy6GNH8= X-MC-Unique: r5wuDlUkPTmSP2wHob9BpA-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 2/7] tests/acceptance: Fix mismatch on cpu tagged tests Date: Thu, 8 Apr 2021 16:52:32 -0300 Message-Id: <20210408195237.3489296-3-wainersm@redhat.com> In-Reply-To: <20210408195237.3489296-1-wainersm@redhat.com> References: <20210408195237.3489296-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There are test cases on machine_mips_malta.py and tcg_plugins.py files where the cpu tag does not correspond to the value actually given to the QE= MU binary. This fixed those tests tags. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Cleber Rosa Reviewed-by: Willian Rampazzo Tested-by: Cleber Rosa --- tests/acceptance/machine_mips_malta.py | 6 +++--- tests/acceptance/tcg_plugins.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/mach= ine_mips_malta.py index 7c9a4ee4d2..b1fd075f51 100644 --- a/tests/acceptance/machine_mips_malta.py +++ b/tests/acceptance/machine_mips_malta.py @@ -96,7 +96,7 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self): """ :avocado: tags=3Darch:mips64el :avocado: tags=3Dmachine:malta - :avocado: tags=3Dcpu:i6400 + :avocado: tags=3Dcpu:I6400 """ self.do_test_i6400_framebuffer_logo(1) =20 @@ -105,7 +105,7 @@ def test_mips_malta_i6400_framebuffer_logo_7cores(self): """ :avocado: tags=3Darch:mips64el :avocado: tags=3Dmachine:malta - :avocado: tags=3Dcpu:i6400 + :avocado: tags=3Dcpu:I6400 :avocado: tags=3Dmips:smp """ self.do_test_i6400_framebuffer_logo(7) @@ -115,7 +115,7 @@ def test_mips_malta_i6400_framebuffer_logo_8cores(self): """ :avocado: tags=3Darch:mips64el :avocado: tags=3Dmachine:malta - :avocado: tags=3Dcpu:i6400 + :avocado: tags=3Dcpu:I6400 :avocado: tags=3Dmips:smp """ self.do_test_i6400_framebuffer_logo(8) diff --git a/tests/acceptance/tcg_plugins.py b/tests/acceptance/tcg_plugins= .py index c21bf9e52a..aa6e18b62d 100644 --- a/tests/acceptance/tcg_plugins.py +++ b/tests/acceptance/tcg_plugins.py @@ -68,7 +68,7 @@ def test_aarch64_virt_insn(self): :avocado: tags=3Daccel:tcg :avocado: tags=3Darch:aarch64 :avocado: tags=3Dmachine:virt - :avocado: tags=3Dcpu:cortex-a57 + :avocado: tags=3Dcpu:cortex-a53 """ kernel_path =3D self._grab_aarch64_kernel() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + @@ -95,7 +95,7 @@ def test_aarch64_virt_insn_icount(self): :avocado: tags=3Daccel:tcg :avocado: tags=3Darch:aarch64 :avocado: tags=3Dmachine:virt - :avocado: tags=3Dcpu:cortex-a57 + :avocado: tags=3Dcpu:cortex-a53 """ kernel_path =3D self._grab_aarch64_kernel() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + @@ -121,7 +121,7 @@ def test_aarch64_virt_mem_icount(self): :avocado: tags=3Daccel:tcg :avocado: tags=3Darch:aarch64 :avocado: tags=3Dmachine:virt - :avocado: tags=3Dcpu:cortex-a57 + :avocado: tags=3Dcpu:cortex-a53 """ kernel_path =3D self._grab_aarch64_kernel() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + --=20 2.29.2 From nobody Sun May 5 22:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617912418; cv=none; d=zohomail.com; s=zohoarc; b=QjneE1wEl8+bpjGtf7TV/v2R0J/Yl6LmQUZxZA5zTlmdwjYfjZ2nsYzRKhEmf4/z1X0CjNrWm0lnah5jFqS9kNx02vqLZia6j1PDui0RVvUpI3IRH6vQIqNKEZ7flLcAcr6yPiOuoIKc+qj9y1+JXZzPquNrPCv38FTfQBgNqyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617912418; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tz9OLhPvFRbkDcRkrknVyEDubsycO9QE/kuKdqY6EfU=; b=Z7LNBioe8U8BOl5FGQbpBNMdQrkwZdBa/SitEoC5OT0F+E3uFjGuhv6z7vis+4V/N8nYFEmm2JZHis9YVWV976Krwf9LQLewxiZFZdlgoUfYXkNjS8LgjNG0MKqznEGPEjVfHT8br2CKtfaCRMF1x8JMKaW6HxmcJJjSHvpi27E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617912418214593.3042176901957; Thu, 8 Apr 2021 13:06:58 -0700 (PDT) Received: from localhost ([::1]:53554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUavY-00038E-WE for importer@patchew.org; Thu, 08 Apr 2021 16:06:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUatx-0001US-Oh for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUatv-0004MS-Dr for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-VcvCL4zHO4iay39mh0p2Iw-1; Thu, 08 Apr 2021 16:05:10 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 213689BE3B5; Thu, 8 Apr 2021 19:53:31 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-57.gru2.redhat.com [10.97.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE63B60864; Thu, 8 Apr 2021 19:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617912314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tz9OLhPvFRbkDcRkrknVyEDubsycO9QE/kuKdqY6EfU=; b=IhxVWKxIAVK/8dsP1xx/Tz23WOSpvmr+xxU7JoDbw9j/5Y7fLCwHxEXYDugJyNGrvx1rRJ 7Gk7JJU2Ji9ALkdgGUPLtGxNKCxe/oacACc+Px5tthJKD7D1/btJalht0Djr3oZFfSZhjJ y06DTzmUd4w/3cIjJtNHMAo4i1q/qe8= X-MC-Unique: VcvCL4zHO4iay39mh0p2Iw-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 3/7] tests/acceptance: Let the framework handle "cpu:VALUE" tagged tests Date: Thu, 8 Apr 2021 16:52:33 -0300 Message-Id: <20210408195237.3489296-4-wainersm@redhat.com> In-Reply-To: <20210408195237.3489296-1-wainersm@redhat.com> References: <20210408195237.3489296-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The tests that are already tagged with "cpu:VALUE" don't need to add "-cpu VALUE" to the list of arguments of the vm object because the avocado_= qemu framework is able to handle it automatically. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Cleber Rosa Reviewed-by: Willian Rampazzo Tested-by: Cleber Rosa --- tests/acceptance/boot_linux.py | 3 --- tests/acceptance/machine_mips_malta.py | 1 - tests/acceptance/replay_kernel.py | 8 +++----- tests/acceptance/reverse_debugging.py | 2 +- tests/acceptance/tcg_plugins.py | 9 ++++----- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 0d178038a0..55637d126e 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -82,7 +82,6 @@ def test_virt_tcg(self): """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") - self.vm.add_args("-cpu", "max") self.vm.add_args("-machine", "virt,gic-version=3D2") self.add_common_args() self.launch_and_wait() @@ -95,7 +94,6 @@ def test_virt_kvm_gicv2(self): """ self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") - self.vm.add_args("-cpu", "host") self.vm.add_args("-machine", "virt,gic-version=3D2") self.add_common_args() self.launch_and_wait() @@ -108,7 +106,6 @@ def test_virt_kvm_gicv3(self): """ self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") - self.vm.add_args("-cpu", "host") self.vm.add_args("-machine", "virt,gic-version=3D3") self.add_common_args() self.launch_and_wait() diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/mach= ine_mips_malta.py index b1fd075f51..b67d8cb141 100644 --- a/tests/acceptance/machine_mips_malta.py +++ b/tests/acceptance/machine_mips_malta.py @@ -62,7 +62,6 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_count): kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'clocksource=3DGIC console=3Dtty0 console= =3DttyS0') self.vm.add_args('-kernel', kernel_path, - '-cpu', 'I6400', '-smp', '%u' % cpu_cores_count, '-vga', 'std', '-append', kernel_command_line) diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index 71facdaa75..75f80506c1 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -156,8 +156,7 @@ def test_aarch64_virt(self): 'console=3DttyAMA0') console_pattern =3D 'VFS: Cannot open root device' =20 - self.run_rr(kernel_path, kernel_command_line, console_pattern, - args=3D('-cpu', 'cortex-a53')) + self.run_rr(kernel_path, kernel_command_line, console_pattern) =20 def test_arm_virt(self): """ @@ -301,7 +300,7 @@ def test_ppc64_e500(self): tar_url =3D ('https://www.qemu-advent-calendar.org' '/2018/download/day19.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) - self.do_test_advcal_2018(file_path, 'uImage', ('-cpu', 'e5500')) + self.do_test_advcal_2018(file_path, 'uImage') =20 def test_ppc_g3beige(self): """ @@ -348,8 +347,7 @@ def test_xtensa_lx60(self): tar_url =3D ('https://www.qemu-advent-calendar.org' '/2018/download/day02.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) - self.do_test_advcal_2018(file_path, 'santas-sleigh-ride.elf', - args=3D('-cpu', 'dc233c')) + self.do_test_advcal_2018(file_path, 'santas-sleigh-ride.elf') =20 @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') class ReplayKernelSlow(ReplayKernelBase): diff --git a/tests/acceptance/reverse_debugging.py b/tests/acceptance/rever= se_debugging.py index be01aca217..d2921e70c3 100644 --- a/tests/acceptance/reverse_debugging.py +++ b/tests/acceptance/reverse_debugging.py @@ -207,4 +207,4 @@ def test_aarch64_virt(self): kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) =20 self.reverse_debugging( - args=3D('-kernel', kernel_path, '-cpu', 'cortex-a53')) + args=3D('-kernel', kernel_path)) diff --git a/tests/acceptance/tcg_plugins.py b/tests/acceptance/tcg_plugins= .py index aa6e18b62d..9ca1515c3b 100644 --- a/tests/acceptance/tcg_plugins.py +++ b/tests/acceptance/tcg_plugins.py @@ -25,7 +25,7 @@ class PluginKernelBase(LinuxKernelTest): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D1 panic=3D-1 ' =20 def run_vm(self, kernel_path, kernel_command_line, - plugin, plugin_log, console_pattern, args): + plugin, plugin_log, console_pattern, args=3DNone): =20 vm =3D self.get_vm() vm.set_console() @@ -80,8 +80,7 @@ def test_aarch64_virt_insn(self): =20 self.run_vm(kernel_path, kernel_command_line, "tests/plugin/libinsn.so", plugin_log.name, - console_pattern, - args=3D('-cpu', 'cortex-a53')) + console_pattern) =20 with plugin_log as lf, \ mmap.mmap(lf.fileno(), 0, access=3Dmmap.ACCESS_READ) as s: @@ -108,7 +107,7 @@ def test_aarch64_virt_insn_icount(self): self.run_vm(kernel_path, kernel_command_line, "tests/plugin/libinsn.so", plugin_log.name, console_pattern, - args=3D('-cpu', 'cortex-a53', '-icount', 'shift=3D1')) + args=3D('-icount', 'shift=3D1')) =20 with plugin_log as lf, \ mmap.mmap(lf.fileno(), 0, access=3Dmmap.ACCESS_READ) as s: @@ -134,7 +133,7 @@ def test_aarch64_virt_mem_icount(self): self.run_vm(kernel_path, kernel_command_line, "tests/plugin/libmem.so,arg=3Dboth", plugin_log.name, console_pattern, - args=3D('-cpu', 'cortex-a53', '-icount', 'shift=3D1')) + args=3D('-icount', 'shift=3D1')) =20 with plugin_log as lf, \ mmap.mmap(lf.fileno(), 0, access=3Dmmap.ACCESS_READ) as s: --=20 2.29.2 From nobody Sun May 5 22:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617911933; cv=none; d=zohomail.com; s=zohoarc; b=eRi2KwBWFQchCvR4dP2ebSfvBJ7DEivFda24K9ljgY97B/WMWsLPYvQCXz2MPprKm6A4o7dIsO0zKdjqukwX25n8N7/8ASUUF6EAVDhuX60wPxT3GhRV5CaPvBAkr5Dd52LCFYIyNEngO7cy9S4y09LCfpuxObhkXMDr7X9FZLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617911933; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1fS/Z1FFdmd07jbgb4ZLjY2o+dvII0AD4J3fSPJ2ETc=; b=hYMIVMNqa2yt7bBDuVC0CcwvSE22ZE2VUwYSrWMuj8FLYUVcPMbfcBsmOJnyOfFos7EoPxSQJg472I6Md03Y/7Xu++VsaUm+9nVqVyz0ISergq1wRr1EJOgeUD93mO4sbWU8ZILDAG3r5fo6XeYQIE9C2nrL5dkiGSsE6v3H6G4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617911932994850.0266266852102; Thu, 8 Apr 2021 12:58:52 -0700 (PDT) Received: from localhost ([::1]:36538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUanj-0004CH-P6 for importer@patchew.org; Thu, 08 Apr 2021 15:58:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUalg-0002G0-Sy for qemu-devel@nongnu.org; Thu, 08 Apr 2021 15:56:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUale-0007qN-NV for qemu-devel@nongnu.org; Thu, 08 Apr 2021 15:56:44 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-44-mIUYRwjGPeOfF66dZ3kT3w-1; Thu, 08 Apr 2021 15:56:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 126EE146E84; Thu, 8 Apr 2021 19:53:43 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-57.gru2.redhat.com [10.97.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C7736A042; Thu, 8 Apr 2021 19:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617911802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1fS/Z1FFdmd07jbgb4ZLjY2o+dvII0AD4J3fSPJ2ETc=; b=RzpSpKCr80GpbV1AbFnh6RE5J9eVL2JxcRtZVVzSmCNGak+VlImL8LnIlTQPGN1gGE6bEn X3NpLt0NsEuZMoFSMXQSYsDCIRqbYckio01XhakjNUX7EZxFf0IvrF2E4kwXR50nxgiyqd vwusF9FOfLAJwzKEC2mZoXAxrCflAOc= X-MC-Unique: mIUYRwjGPeOfF66dZ3kT3w-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 4/7] tests/acceptance: Tagging tests with "cpu:VALUE" Date: Thu, 8 Apr 2021 16:52:34 -0300 Message-Id: <20210408195237.3489296-5-wainersm@redhat.com> In-Reply-To: <20210408195237.3489296-1-wainersm@redhat.com> References: <20210408195237.3489296-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The existing tests which are passing "-cpu VALUE" argument to the vm object are now properly "cpu:VALUE" tagged, so letting the avocado_qemu framework = to handle that automatically. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Cleber Rosa Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 16 +++++++++------- tests/acceptance/pc_cpu_hotplug_props.py | 2 +- tests/acceptance/replay_kernel.py | 9 ++++++--- tests/acceptance/virtio-gpu.py | 4 ++-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 1ca32ecf25..b7a856d871 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -238,6 +238,7 @@ def test_mips64el_malta_5KEc_cpio(self): :avocado: tags=3Darch:mips64el :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little + :avocado: tags=3Dcpu:5KEc """ kernel_url =3D ('https://github.com/philmd/qemu-testing-blob/' 'raw/9ad2df38/mips/malta/mips64el/' @@ -257,8 +258,7 @@ def test_mips64el_malta_5KEc_cpio(self): kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'console=3DttyS0 console=3Dtty ' + 'rdinit=3D/sbin/init noreboot') - self.vm.add_args('-cpu', '5KEc', - '-kernel', kernel_path, + self.vm.add_args('-kernel', kernel_path, '-initrd', initrd_path, '-append', kernel_command_line, '-no-reboot') @@ -286,7 +286,6 @@ def do_test_mips_malta32el_nanomips(self, kernel_url, k= ernel_hash): + 'mem=3D256m@@0x0 ' + 'console=3DttyS0') self.vm.add_args('-no-reboot', - '-cpu', 'I7200', '-kernel', kernel_path, '-append', kernel_command_line) self.vm.launch() @@ -298,6 +297,7 @@ def test_mips_malta32el_nanomips_4k(self): :avocado: tags=3Darch:mipsel :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little + :avocado: tags=3Dcpu:I7200 """ kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' @@ -310,6 +310,7 @@ def test_mips_malta32el_nanomips_16k_up(self): :avocado: tags=3Darch:mipsel :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little + :avocado: tags=3Dcpu:I7200 """ kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' @@ -322,6 +323,7 @@ def test_mips_malta32el_nanomips_64k_dbg(self): :avocado: tags=3Darch:mipsel :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little + :avocado: tags=3Dcpu:I7200 """ kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' @@ -333,6 +335,7 @@ def test_aarch64_virt(self): """ :avocado: tags=3Darch:aarch64 :avocado: tags=3Dmachine:virt + :avocado: tags=3Dcpu:cortex-a53 """ kernel_url =3D ('https://archives.fedoraproject.org/pub/archive/fe= dora' '/linux/releases/29/Everything/aarch64/os/images/pxe= boot' @@ -343,8 +346,7 @@ def test_aarch64_virt(self): self.vm.set_console() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'console=3DttyAMA0') - self.vm.add_args('-cpu', 'cortex-a53', - '-kernel', kernel_path, + self.vm.add_args('-kernel', kernel_path, '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line @@ -1038,9 +1040,9 @@ def test_ppc64_e500(self): """ :avocado: tags=3Darch:ppc64 :avocado: tags=3Dmachine:ppce500 + :avocado: tags=3Dcpu:e5500 """ tar_hash =3D '6951d86d644b302898da2fd701739c9406527fe1' - self.vm.add_args('-cpu', 'e5500') self.do_test_advcal_2018('19', tar_hash, 'uImage') =20 def test_ppc_g3beige(self): @@ -1082,7 +1084,7 @@ def test_xtensa_lx60(self): """ :avocado: tags=3Darch:xtensa :avocado: tags=3Dmachine:lx60 + :avocado: tags=3Dcpu:dc233c """ tar_hash =3D '49e88d9933742f0164b60839886c9739cb7a0d34' - self.vm.add_args('-cpu', 'dc233c') self.do_test_advcal_2018('02', tar_hash, 'santas-sleigh-ride.elf') diff --git a/tests/acceptance/pc_cpu_hotplug_props.py b/tests/acceptance/pc= _cpu_hotplug_props.py index f48f68fc6b..2e86d5017a 100644 --- a/tests/acceptance/pc_cpu_hotplug_props.py +++ b/tests/acceptance/pc_cpu_hotplug_props.py @@ -25,11 +25,11 @@ class OmittedCPUProps(Test): """ :avocado: tags=3Darch:x86_64 + :avocado: tags=3Dcpu:qemu64 """ def test_no_die_id(self): self.vm.add_args('-nodefaults', '-S') self.vm.add_args('-smp', '1,sockets=3D2,cores=3D2,threads=3D2,maxc= pus=3D8') - self.vm.add_args('-cpu', 'qemu64') self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=3D1,core-= id=3D0,thread-id=3D0') self.vm.launch() self.assertEquals(len(self.vm.command('query-cpus-fast')), 2) diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index 75f80506c1..bb32b31240 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -392,6 +392,7 @@ def test_mips64el_malta_5KEc_cpio(self): :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little :avocado: tags=3Dslowness:high + :avocado: tags=3Dcpu:5KEc """ kernel_url =3D ('https://github.com/philmd/qemu-testing-blob/' 'raw/9ad2df38/mips/malta/mips64el/' @@ -412,7 +413,7 @@ def test_mips64el_malta_5KEc_cpio(self): 'rdinit=3D/sbin/init noreboot') console_pattern =3D 'Boot successful.' self.run_rr(kernel_path, kernel_command_line, console_pattern, shi= ft=3D5, - args=3D('-initrd', initrd_path, '-cpu', '5KEc')) + args=3D('-initrd', initrd_path)) =20 def do_test_mips_malta32el_nanomips(self, kernel_path_xz): kernel_path =3D self.workdir + "kernel" @@ -424,14 +425,14 @@ def do_test_mips_malta32el_nanomips(self, kernel_path= _xz): 'mem=3D256m@@0x0 ' 'console=3DttyS0') console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.run_rr(kernel_path, kernel_command_line, console_pattern, shi= ft=3D5, - args=3D('-cpu', 'I7200')) + self.run_rr(kernel_path, kernel_command_line, console_pattern, shi= ft=3D5) =20 def test_mips_malta32el_nanomips_4k(self): """ :avocado: tags=3Darch:mipsel :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little + :avocado: tags=3Dcpu:I7200 """ kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' @@ -445,6 +446,7 @@ def test_mips_malta32el_nanomips_16k_up(self): :avocado: tags=3Darch:mipsel :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little + :avocado: tags=3Dcpu:I7200 """ kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' @@ -458,6 +460,7 @@ def test_mips_malta32el_nanomips_64k_dbg(self): :avocado: tags=3Darch:mipsel :avocado: tags=3Dmachine:malta :avocado: tags=3Dendian:little + :avocado: tags=3Dcpu:I7200 """ kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' diff --git a/tests/acceptance/virtio-gpu.py b/tests/acceptance/virtio-gpu.py index ab18cddbb7..3494297b22 100644 --- a/tests/acceptance/virtio-gpu.py +++ b/tests/acceptance/virtio-gpu.py @@ -60,6 +60,7 @@ def test_virtio_vga_virgl(self): """ :avocado: tags=3Darch:x86_64 :avocado: tags=3Ddevice:virtio-vga + :avocado: tags=3Dcpu:host """ kernel_command_line =3D ( self.KERNEL_COMMON_COMMAND_LINE + "console=3DttyS0 rdinit=3D/b= in/bash" @@ -72,7 +73,6 @@ def test_virtio_vga_virgl(self): initrd_path =3D self.fetch_asset(self.INITRD_URL) =20 self.vm.set_console() - self.vm.add_args("-cpu", "host") self.vm.add_args("-m", "2G") self.vm.add_args("-machine", "pc,accel=3Dkvm") self.vm.add_args("-device", "virtio-vga,virgl=3Don") @@ -101,6 +101,7 @@ def test_vhost_user_vga_virgl(self): """ :avocado: tags=3Darch:x86_64 :avocado: tags=3Ddevice:vhost-user-vga + :avocado: tags=3Dcpu:host """ kernel_command_line =3D ( self.KERNEL_COMMON_COMMAND_LINE + "console=3DttyS0 rdinit=3D/b= in/bash" @@ -140,7 +141,6 @@ def test_vhost_user_vga_virgl(self): ) =20 self.vm.set_console() - self.vm.add_args("-cpu", "host") self.vm.add_args("-m", "2G") self.vm.add_args("-object", "memory-backend-memfd,id=3Dmem,size=3D= 2G") self.vm.add_args("-machine", "pc,memory-backend=3Dmem,accel=3Dkvm") --=20 2.29.2 From nobody Sun May 5 22:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617912253; cv=none; d=zohomail.com; s=zohoarc; b=L17AvQYafAQDNizvh0eWxUvJjdmej+Z+1NbHeMOvNDO2DqHGpanmYrI4bP/RKDRmLNfagObvj2OIq1hZm4llKarFcwBS9aBiQqjzwFAZTx5sxVpNHeAl4KzXzQlIoUPq9GwkxIECSaGZXcVf1Zg7z7tP+2Lc0iDVNWGHLQEg8Vc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617912253; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JFRgKxGH5NTpCtdAvzCYo5JEqzCCKwdBjkCyhW28bUU=; b=HKhQ3mjTT7m6Zo9/M3pR/RnmpFIGFHPO8nwgb73vmmOCElE8/hIDEiPxQSCSWAEiFj0V9PVzwRpQw+Evj1H0RtkqitbtXH/hpExq8YoI/Qxd0PUaeOpWkY8sEdtbXGBvfqmqQQwoZ1KjYkCvYG9Z+5F/5DIs33OPzmUT1ldTJwE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617912253808186.15931053820566; Thu, 8 Apr 2021 13:04:13 -0700 (PDT) Received: from localhost ([::1]:48034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUasu-0000iL-FO for importer@patchew.org; Thu, 08 Apr 2021 16:04:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUart-0008OE-6B for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:03:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUarp-0003AS-Om for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:03:08 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-197-x0l4MlphPmOmc8DV46sJtw-1; Thu, 08 Apr 2021 16:03:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CB881B86ECE; Thu, 8 Apr 2021 19:53:55 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-57.gru2.redhat.com [10.97.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2105560853; Thu, 8 Apr 2021 19:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617912184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JFRgKxGH5NTpCtdAvzCYo5JEqzCCKwdBjkCyhW28bUU=; b=Mg6EM8K/qQqpxHgwm+Ad/EHHFB/Duu/Wm0niS9H0N1xYFaCIaW32bZoCywqLzWcFK2lBf4 vU3ts2BrKDDuHJmEfwB2R21/Sc9FKcmBbYVSWDpnMexexQtrM3efntpm7ouqwX7aP3LCnz pfmQzV3R08m2++xb1N7+TCwzpOjWnFc= X-MC-Unique: x0l4MlphPmOmc8DV46sJtw-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 5/7] python/qemu: Add args property to the QEMUMachine class Date: Thu, 8 Apr 2021 16:52:35 -0300 Message-Id: <20210408195237.3489296-6-wainersm@redhat.com> In-Reply-To: <20210408195237.3489296-1-wainersm@redhat.com> References: <20210408195237.3489296-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This added the args property to QEMUMachine so that users of the class can access and handle the list of arguments to be given to the QEMU binary. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Cleber Rosa Reviewed-by: Willian Rampazzo --- python/qemu/machine.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 6e44bda337..1c30bde99d 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -302,6 +302,11 @@ def _base_args(self) -> List[str]: args.extend(['-device', device]) return args =20 + @property + def args(self) -> List[str]: + """Returns the list of arguments given to the QEMU binary.""" + return self._args + def _pre_launch(self) -> None: self._temp_dir =3D tempfile.mkdtemp(prefix=3D"qemu-machine-", dir=3Dself._test_dir) --=20 2.29.2 From nobody Sun May 5 22:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617911857; cv=none; d=zohomail.com; s=zohoarc; b=AwXWe0SALk//HxzEm1vrKSyA2GqIJES8vYdo3DgvNPiq9hMiSCFG/BDH5UtYSsaLA8DsOBNANtFpaG+JclWXXGhf5MBaaFmbRHaKQ/sTpOFJiVjYw0kfK2hCwkEILInHx2sk5+Qu2OWZXTBkraQtwD/1wcec0GmXodribRG10/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617911857; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gPQqGX1Lj4ujFXtKmJw/PsRrczBaapS6OX+gMssTGMw=; b=B+gm1hHUMPMRrGtPylerk5vEJZsLBZeFgLLYNQQ79Y1yMKGuZ6U1kkebX4uIF2UNTjrWB/6K+HtqRijJD+N1/iVD4oZHIrfR7C8fjOuhC2kn51QahPEfD7ACTyeoX01jRy7VsOmv7UsCDYKmq7W+zBHrlOBsBKvBkb48z3GPMFc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617911857181869.3911481475087; Thu, 8 Apr 2021 12:57:37 -0700 (PDT) Received: from localhost ([::1]:34036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUamW-0003Aj-4b for importer@patchew.org; Thu, 08 Apr 2021 15:57:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUalf-0002D5-3u for qemu-devel@nongnu.org; Thu, 08 Apr 2021 15:56:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUalb-0007oH-PC for qemu-devel@nongnu.org; Thu, 08 Apr 2021 15:56:41 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-32-9hW5XrRYPLiFhOLXpm5GuA-1; Thu, 08 Apr 2021 15:56:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0945F9BE739; Thu, 8 Apr 2021 19:54:08 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-57.gru2.redhat.com [10.97.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A62460864; Thu, 8 Apr 2021 19:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617911798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gPQqGX1Lj4ujFXtKmJw/PsRrczBaapS6OX+gMssTGMw=; b=YseefCstH7pMr+n/s2TTU6fAsk5SJzZ3xp4qLWJnHUpxwNcuzCEyuvnd/+NUWh8aRBoqs5 W72flIoImgADXo1Ix/S9Z79lr7tobmrmKlqtM4kAT29xXmVFx5+K1BSy3KpL1VPPu0xXlW rTvoppBFRzG8urdiTSAuM1slliz8HNQ= X-MC-Unique: 9hW5XrRYPLiFhOLXpm5GuA-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 6/7] tests/acceptance: Add set_vm_arg() to the Test class Date: Thu, 8 Apr 2021 16:52:36 -0300 Message-Id: <20210408195237.3489296-7-wainersm@redhat.com> In-Reply-To: <20210408195237.3489296-1-wainersm@redhat.com> References: <20210408195237.3489296-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The set_vm_arg method is added to avocado_qemu.Test class on this change. Use that method to set (or replace) an argument to the list of arguments given to the QEMU binary. Suggested-by: Cleber Rosa Signed-off-by: Wainer dos Santos Moschetta --- tests/acceptance/avocado_qemu/__init__.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 7f8e703757..5314ce70eb 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -240,6 +240,22 @@ def get_vm(self, *args, name=3DNone): self._vms[name].set_machine(self.machine) return self._vms[name] =20 + def set_vm_arg(self, arg, value): + """ + Set an argument to list of extra arguments to be given to the QEMU + binary. If the argument already exists then its value is replaced. + + :param arg: the QEMU argument, such as "-cpu" in "-cpu host" + :type arg: str + :param value: the argument value, such as "host" in "-cpu host" + :type value: str + """ + if arg not in self.vm.args: + self.vm.args.extend([arg, value]) + else: + idx =3D self.vm.args.index(arg) + self.vm.args[idx + 1] =3D value + def tearDown(self): for vm in self._vms.values(): vm.shutdown() --=20 2.29.2 From nobody Sun May 5 22:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617912557; cv=none; d=zohomail.com; s=zohoarc; b=XbhAV9LqB1hM52ng5S4m+IG3Lu10O0SASK2DdSBJW2T1LQS6CEwF//QYJMjlsUn5xIJMJkXwjUHA9qQAwmt2GQ2L8jyvuNfZ3MQ7p4LKH5DnDbDgXpEnd0H1jMB0LCgYYkzmAirD+QB45lZoW2wzv1L8tUdG1xGhy0eFsbgs/zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617912557; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O4BOOaXPe8Kuzccz1aS2grvfaVdsqyBeB/wA3uOnaqk=; b=MdKbxqF8+YOP0NUsaLfOumhh/UItIJUb9Z+Jirjx9QTPm4aQ0ynDo0off9rbrcGXO1u9UpK/GtY6bLQNQASMHziLq4Pt4z3dEpzT7mBWVrHiA3xAjVMtAN538arwwtftgluMQ6WCI8VSkd8nDyNVL9hHF3RoqJSX5MtrdYT4e08= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617912557545788.6349537266443; Thu, 8 Apr 2021 13:09:17 -0700 (PDT) Received: from localhost ([::1]:33182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUaxo-0006MR-A2 for importer@patchew.org; Thu, 08 Apr 2021 16:09:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUatz-0001Vp-AE for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUatt-0004Lj-GF for qemu-devel@nongnu.org; Thu, 08 Apr 2021 16:05:19 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-ene0py8UNYy6eeSM96RXOA-1; Thu, 08 Apr 2021 16:05:10 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53E9514B779F; Thu, 8 Apr 2021 19:54:20 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-57.gru2.redhat.com [10.97.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id E83A018EC5; Thu, 8 Apr 2021 19:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617912312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O4BOOaXPe8Kuzccz1aS2grvfaVdsqyBeB/wA3uOnaqk=; b=RYIMCpyqtsdLmfB488vdRsqlj3Bb1L/34KyavNodnsrIPwzWZvRC3NkoxfBtcHaT2qtBeD llh0eKD2xWfU4UcWj1vVN1GaCVsZuzbDI2auiPt3/OocRgHpY14WJvbCSROD0rIrQyKMxq hjul0QUDu+JEIBRuvJ17mk/WQrBsLTg= X-MC-Unique: ene0py8UNYy6eeSM96RXOA-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 7/7] tests/acceptance: Handle cpu tag on x86_cpu_model_versions tests Date: Thu, 8 Apr 2021 16:52:37 -0300 Message-Id: <20210408195237.3489296-8-wainersm@redhat.com> In-Reply-To: <20210408195237.3489296-1-wainersm@redhat.com> References: <20210408195237.3489296-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Some test cases on x86_cpu_model_versions.py are corner cases because they need to pass extra options to the -cpu argument. Once the avocado_qemu framework will set -cpu automatically, the value should be reset. This chan= ged those tests so to call set_vm_arg() to overwrite the -cpu value. Signed-off-by: Wainer dos Santos Moschetta --- tests/acceptance/x86_cpu_model_versions.py | 40 +++++++++++++++++----- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/acceptance/= x86_cpu_model_versions.py index 77ed8597a4..0e9feda62d 100644 --- a/tests/acceptance/x86_cpu_model_versions.py +++ b/tests/acceptance/x86_cpu_model_versions.py @@ -252,10 +252,13 @@ def get_cpu_prop(self, prop): def test_4_1(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.1 + :avocado: tags=3Dcpu:Cascadelake-Server """ # machine-type only: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.1 + Cascadelake-Server should not ha= ve arch-capabilities') @@ -263,9 +266,12 @@ def test_4_1(self): def test_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server should not ha= ve arch-capabilities') @@ -273,10 +279,13 @@ def test_4_0(self): def test_set_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ # command line must override machine-type if CPU model is not vers= ioned: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff,+arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff,+arch-capabilities') self.vm.launch() self.assertTrue(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server,+arch-capabili= ties should have arch-capabilities') @@ -284,9 +293,12 @@ def test_set_4_0(self): def test_unset_4_1(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.1 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff,-arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff,-arch-capabilities') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.1 + Cascadelake-Server,-arch-capabil= ities should not have arch-capabilities') @@ -294,10 +306,13 @@ def test_unset_4_1(self): def test_v1_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ # versioned CPU model overrides machine-type: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features= =3Don,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v1,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server-v1 should not= have arch-capabilities') @@ -305,9 +320,12 @@ def test_v1_4_0(self): def test_v2_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features= =3Don,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v2,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff') self.vm.launch() self.assertTrue(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server-v2 should have= arch-capabilities') @@ -315,10 +333,13 @@ def test_v2_4_0(self): def test_v1_set_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ # command line must override machine-type and versioned CPU model: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features= =3Don,check=3Doff,enforce=3Doff,+arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v1,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff,+arch-capabilities') self.vm.launch() self.assertTrue(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server-v1,+arch-capab= ilities should have arch-capabilities') @@ -326,9 +347,12 @@ def test_v1_set_4_0(self): def test_v2_unset_4_1(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.1 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features= =3Don,check=3Doff,enforce=3Doff,-arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v2,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff,-arch-capabilities') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.1 + Cascadelake-Server-v2,-arch-capa= bilities should not have arch-capabilities') --=20 2.29.2