From nobody Tue May 14 19:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619790536; cv=none; d=zohomail.com; s=zohoarc; b=CbEqjbkjSzOVlbReU1/M7CL6mIUxvGZjVeIwnU0ujOcktM7Bsuut2eCrpaRh9I7SO2y7qQ9Rld82j6faBxkqq+VpiVYgeHU8whB/TSXblfmBCYpwIsBl2tIilD5i5VSUolAU2OA7Swl4VklVXuYhDSOGqf0J0hPpJEyBx1WI0po= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619790536; 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=MOjjjb+0eRI+fxleeM23GfZTTJk0eRDunRFSgh0Cxic=; b=f0jAbVEews6rlmB/aT6aThN2ZJwfSzbIWMuzmRt+DpD2FdJ+ibyjjeJZTFYbpsQF7YUi7se9KlPz5ANTeJb458vPYmLTRCps82xAMIiuqhg0HXgQbXNWA8EU7eOpNXNb9TC2KkSE4MIekpjxrCxmetclupnJZXHRrQemiVFUKyI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1619790536675352.2048722738656; Fri, 30 Apr 2021 06:48:56 -0700 (PDT) Received: from localhost ([::1]:33628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTVm-00047Z-JL for importer@patchew.org; Fri, 30 Apr 2021 09:48:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIr-0005RD-Qx for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIp-00089j-SH for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:33 -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-216-IRpqNUILPjKXfRpwBa6DGw-1; Fri, 30 Apr 2021 09:35:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C5698030D0; Fri, 30 Apr 2021 13:34:51 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7ADA5D9E2; Fri, 30 Apr 2021 13:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789731; 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=MOjjjb+0eRI+fxleeM23GfZTTJk0eRDunRFSgh0Cxic=; b=JJjzetHyTvHp/nTqnIhfljR16SpWRd8DccvMvTZhJzrwlUbvi5BmPv8sHyJn+wCoTwNNBn MXjhER2aBqiOcJiuMH5NqgoG4CXWwn4ENfjC7owC3ndafvDP7VqcTrhSpV78eEZ+rEvLqA NY9pJnr7WBsVnvwxDhWpJT0kLVupDI8= X-MC-Unique: IRpqNUILPjKXfRpwBa6DGw-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 1/7] tests/acceptance: Automatic set -cpu to the test vm Date: Fri, 30 Apr 2021 10:34:08 -0300 Message-Id: <20210430133414.39905-2-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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, Willian Rampazzo , 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: fail (Header signature does not verify) 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,path=3D/var/tmp/avo_qemu_sock_pdgzbgd_/qem= u-1135557-monitor.sock \ -mon chardev=3Dmon,mode=3Dcontrol -cpu host Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa Reviewed-by: Willian Rampazzo Signed-off-by: Wainer dos Santos Moschetta --- 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 Tue May 14 19:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619790371; cv=none; d=zohomail.com; s=zohoarc; b=OTbA4CU+dVag3MlCdZYtgPLe609CMj1mQEfiyqV/8u0KWpzP1HWntulYgBx5F6minAanICULM/wp9gp3Mv5eUlqj6xT18gX4aDh0IBDEa2MAiE4PlAnIYls1vlCqGRzbwRI+ClC/M5CWguAXSM7GWOPjV9wg3hCo1xuNs6TgtuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619790371; 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=rw82Ix4YevshIZ0FPvHeN9UzXJA1LQ5QZP6NzreoCqM=; b=HyWwMx9j8s0e7/MxGcxs3gId+LbkA8Qp8gh833GBgKZ1XRPYhuxbnjbVWG0W3I9h+jjftKYld6CUU1iYE1GJv/+ay0CCSm5sPjRiV9qbKvJnSXX6PzBv4VthK+xpbtRIqazbD1dn1xEDTErCZm5HWSOdNwD6lEcYKoaovYXC4vw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1619790371676510.79527155367214; Fri, 30 Apr 2021 06:46:11 -0700 (PDT) Received: from localhost ([::1]:53786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTT3-000059-Cp for importer@patchew.org; Fri, 30 Apr 2021 09:46:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIp-0005Mh-La for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIm-00087T-HM for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:31 -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-289-syuq7dW6Pf2FKjima12Lbg-1; Fri, 30 Apr 2021 09:35:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9CAA106B21C; Fri, 30 Apr 2021 13:34:57 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A3805D9E2; Fri, 30 Apr 2021 13:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789727; 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=rw82Ix4YevshIZ0FPvHeN9UzXJA1LQ5QZP6NzreoCqM=; b=f7clGjLPaV4JfgJQYRB3AYqBlZzhR/U9dpfjEKAyzedfCyl9lscruo9K0jlAG0kgtUKeb1 PWjtLAA3WA33tl8zYjqSq4Zq/IWoChI1TyaWpLeRM+vJfhodKsvdsvnanHhK4dhb4J1utQ YJda0gmd9FSvBzA7gIPsUbLwzaW/6V8= X-MC-Unique: syuq7dW6Pf2FKjima12Lbg-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 2/7] tests/acceptance: Fix mismatch on cpu tagged tests Date: Fri, 30 Apr 2021 10:34:09 -0300 Message-Id: <20210430133414.39905-3-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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, Willian Rampazzo , 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: fail (Header signature does not verify) 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. Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa Reviewed-by: Willian Rampazzo Signed-off-by: Wainer dos Santos Moschetta --- 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 Tue May 14 19:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619791038; cv=none; d=zohomail.com; s=zohoarc; b=Xgyt84YKSKDhgWkqL6FikVFwSU6wxNkpUO7GDjxAwSv39fF8cXKdPpB6GNKf+XOFnocrmZ9HdSI9a0TZ3Uuxc27hYtQyK1waP+xEbARYgf26cP0mXGj1H0OmSWBXhZaXbilQCY1VjU/d0IX+nC10ABuOfIUYT1uS3jtLTjiSG1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619791038; 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=4XULC5XbmndB5H1HDhnXpkwm2ePxPV19wF1afoVOQlE=; b=Vr1x/8vQYoAvgKuwKgVIM/KnOOxDvbhSfum193kebWtUsRZz0W1MvsureMvZsiDYjtWkQho+bFMy/aRFM5W3armrjyEkeQmJnQiBCwAmyyq4H0Ik4NZEJnHe73NDbHzI9HZGusA20TI3zoujAmmtcQD8O0csr8A3AL8OMGnlaNY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1619791038449718.5755079390307; Fri, 30 Apr 2021 06:57:18 -0700 (PDT) Received: from localhost ([::1]:57676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTdt-0005mF-AS for importer@patchew.org; Fri, 30 Apr 2021 09:57:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIr-0005Q2-Az for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43768) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIm-000871-7x for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:33 -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-187-gUoeYj9tPRKKhrPJ-59rVw-1; Fri, 30 Apr 2021 09:35:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0F2D0100A671; Fri, 30 Apr 2021 13:35:05 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE8C05D9E2; Fri, 30 Apr 2021 13:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789727; 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=4XULC5XbmndB5H1HDhnXpkwm2ePxPV19wF1afoVOQlE=; b=SD0h8NbG1fdUAcbPArJVT3QFxZ/7WStO6P3g7WHWRMrwPbcf4zBLkN+EXlFO8QQX19YAKs ZyOfcBShq0h1LLIwS394ln0I7caQ4wQzaZrAjvXgvrJ/+DP/hmJzo8Qco4bSmUOY3i0YD/ pJfmOFISgGgNKpIFa4SAoH9EpA8M124= X-MC-Unique: gUoeYj9tPRKKhrPJ-59rVw-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 3/7] tests/acceptance: Let the framework handle "cpu:VALUE" tagged tests Date: Fri, 30 Apr 2021 10:34:10 -0300 Message-Id: <20210430133414.39905-4-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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, Willian Rampazzo , 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: fail (Header signature does not verify) 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. Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa Reviewed-by: Willian Rampazzo Signed-off-by: Wainer dos Santos Moschetta --- tests/acceptance/boot_linux.py | 3 --- tests/acceptance/boot_xen.py | 1 - 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 ++++----- 6 files changed, 8 insertions(+), 16 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/boot_xen.py b/tests/acceptance/boot_xen.py index 75c2d44492..3479b5233b 100644 --- a/tests/acceptance/boot_xen.py +++ b/tests/acceptance/boot_xen.py @@ -48,7 +48,6 @@ def launch_xen(self, xen_path): =20 xen_command_line =3D self.XEN_COMMON_COMMAND_LINE self.vm.add_args('-machine', 'virtualization=3Don', - '-cpu', 'cortex-a57', '-m', '768', '-kernel', xen_path, '-append', xen_command_line, 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 Tue May 14 19:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619793508; cv=none; d=zohomail.com; s=zohoarc; b=KPoq9q90tdvg1OCmFHVAo+NINVTMJaeRv3bpRoT6p1HHceBbEolMWJMrFGNhpLso1JWluh7+NHHhv24f4cqLiwB1obiiOYL8bwyKiYew1073O/w2ZnJPHAZWQQCsKSzs045M4/+cFWxwnik7w1AQNU+kdYgBSkxCnu7TZgD46Nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619793508; 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=3r16mAzzMo+NZzx8vBd+i5krlG0haSpb5DdLP8doYXY=; b=lxgd2aMRTspPl20YtbTN32lA+TNDshTCReJ48Z0joEapX0Pascg07sIT18kjqAU0ZRbtd6pthew+hAN2vtIMtuXknFlYKvqc6DuPb/cTkF79r+CRxCwar8LZLyPAxSc25PXDNOKWbaRapqnRtCE5do0cRbeYSozLlZ5aSZzyKb8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 161979350811741.75595708741196; Fri, 30 Apr 2021 07:38:28 -0700 (PDT) Received: from localhost ([::1]:51014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcUHh-0005SL-C4 for importer@patchew.org; Fri, 30 Apr 2021 10:38:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIq-0005P3-RJ for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIm-00086i-MD for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:32 -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-166-XTrauyIsM5GE6NeKlki3OA-1; Fri, 30 Apr 2021 09:35:24 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD073100A910; Fri, 30 Apr 2021 13:35:11 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26D9D5D9E2; Fri, 30 Apr 2021 13:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789727; 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=3r16mAzzMo+NZzx8vBd+i5krlG0haSpb5DdLP8doYXY=; b=T+9mODWr2JFnAyUeFDmchOarojT89VpzuNMo+Ra1Zqy/pHoISyJFOOMPvugodt1vvsfLlY mXtW1OWy+SGrtT9u4FP0aYrli/ezPN4lVstnNyStWTMj14UB64keegAUAgZcMZo7yTRVqP cRoLhbers2K9w6v1F4o+dG5EnYTem9A= X-MC-Unique: XTrauyIsM5GE6NeKlki3OA-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 4/7] tests/acceptance: Tagging tests with "cpu:VALUE" Date: Fri, 30 Apr 2021 10:34:11 -0300 Message-Id: <20210430133414.39905-5-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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, Willian Rampazzo , 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: fail (Header signature does not verify) 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. Reviewed-by: Cleber Rosa Reviewed-by: Willian Rampazzo Signed-off-by: Wainer dos Santos Moschetta --- 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 Tue May 14 19:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619790695; cv=none; d=zohomail.com; s=zohoarc; b=OPMdXH2HM7qpCI90jpHqDB9n7MRZelwCIU/0fbW6RGa87CykMYVOhmS8Av9wfmMN2n7YqB1s9R4pwcpAJS1ab2O6nFHmiZ9P7Hl+EWgpDQoaTq8HH5dvXAAkd0a1wsf0yw+G62Dhc98Q14y2I+lUDq/xOF1pbnaH52NGzASc13g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619790695; 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=B6sQwub1F3unjtkIDBqkyx8Yo4UU3FxQY5yYllnZCqU=; b=Sp68a9h78MTwOQngJnqOnXQo7YWjFBNocxNJ9OnqJ3elvm9m1uNwTg62AE5UyiY3Jsd+4MspEOpCl106vHE0XVJJH2UJv0cVXjKqjK2v3VFb8awYYeevyy5J6eZvl+HUdqrduuQ4lDIPXvF6709i5omj7G6C0Yju5+1Opk1Uwz8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1619790695837701.8970872568107; Fri, 30 Apr 2021 06:51:35 -0700 (PDT) Received: from localhost ([::1]:41162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTYM-0007MA-QT for importer@patchew.org; Fri, 30 Apr 2021 09:51:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIs-0005SE-9u for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIq-0008AH-Ek for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:34 -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-532-JwOtQXMlO8q1wpMqL0U7tA-1; Fri, 30 Apr 2021 09:35:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE9EE8042C7; Fri, 30 Apr 2021 13:35:18 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABD3F5D9E2; Fri, 30 Apr 2021 13:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789731; 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=B6sQwub1F3unjtkIDBqkyx8Yo4UU3FxQY5yYllnZCqU=; b=DrAzqr8mcN7FkwakT8DmBC7kva32aaINRz6WqFf1e1P1/w+TA0AkvbWRp6ijB9UXe94jrl KP95vhjQH9/Tx+9U/IOLgvMk1J+YyFSHQe5Ad8R9tNf15Ssz/tkBR6pUneX7ux8Y8vLl35 mZrSv9xcGbeUseYnlm4Q6cUk+IPL35I= X-MC-Unique: JwOtQXMlO8q1wpMqL0U7tA-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 5/7] python/qemu: Add args property to the QEMUMachine class Date: Fri, 30 Apr 2021 10:34:12 -0300 Message-Id: <20210430133414.39905-6-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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, Willian Rampazzo , 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: fail (Header signature does not verify) 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. Reviewed-by: Cleber Rosa Reviewed-by: Willian Rampazzo Signed-off-by: Wainer dos Santos Moschetta --- 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 Tue May 14 19:37:35 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=1619790221; cv=none; d=zohomail.com; s=zohoarc; b=TvlqdqjmxYNdTzp6a/Wc1lq/2JdgrgMHS+1wk060/pynVtlJKzOqbWQD6p+NXynht2kQjUcwLEclsf2ODlB04asHWHWG/mY07vERCWSD4KF/is1CKk3EiBRtSdwQACg2RamDa+yaP9mv/NSx52If7gArcG2xp96/DBYg5R8lIcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619790221; 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=dFxTABUUrMBPoIvZTsVxL6ehkkwIZc4YfPakC/jdzS4=; b=BHE1x8JsTI0PsVrVCSHZxZWihiNj23JvdLc7jGq6yTY4PtgeKPSCG8tiQFDkn8+v24C7ZgUhLuVrUBLdmM+uh9jtdpHPQfmhkWhukL+kvJJKwSsYsVn0xr2eQxsocmwiGL9eDLrlUBHEVFVUS68wjj2cWpyN7ool33OL7cV0QXk= 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 1619790221675375.21709525817676; Fri, 30 Apr 2021 06:43:41 -0700 (PDT) Received: from localhost ([::1]:47706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTQi-0005wk-EB for importer@patchew.org; Fri, 30 Apr 2021 09:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIs-0005Sx-Nd for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIo-000889-MI for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:34 -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-26-jwCX5JV1Mcmg7Lu5untkjQ-1; Fri, 30 Apr 2021 09:35:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DB4B218A08D4; Fri, 30 Apr 2021 13:35:24 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EB075D9E2; Fri, 30 Apr 2021 13:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789729; 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=dFxTABUUrMBPoIvZTsVxL6ehkkwIZc4YfPakC/jdzS4=; b=M0Yb7bwMzx4yKIcMtB7k/Pq5bhQHi5D0XvC+VNLxHwbifJRdINMZHf3UYgPAjk7gDYC0el neUORdNtDuCbgD4ZdUUaF4fAGIuk3n7AiCZHLpiy/hOLSufssGjHPLDuSruQci0+myBcKF KrucH/EbPFXUkSoSKnrD4O7Qz13+yqo= X-MC-Unique: jwCX5JV1Mcmg7Lu5untkjQ-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 6/7] tests/acceptance: Add set_vm_arg() to the Test class Date: Fri, 30 Apr 2021 10:34:13 -0300 Message-Id: <20210430133414.39905-7-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 7f8e703757..14c6ae70c8 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -240,6 +240,27 @@ 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 not arg or not value: + return + if arg not in self.vm.args: + self.vm.args.extend([arg, value]) + else: + idx =3D self.vm.args.index(arg) + 1 + if idx < len(self.vm.args): + self.vm.args[idx] =3D value + else: + self.vm.args.append(value) + def tearDown(self): for vm in self._vms.values(): vm.shutdown() --=20 2.29.2 From nobody Tue May 14 19:37:35 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=1619790805; cv=none; d=zohomail.com; s=zohoarc; b=NZczxHsklkFIi7aBkRE2pBVrWW339ncoHU5J4PlVTB7G+0dNxOAQzvHf0wsTTDzSENVbSau+CmSmNGhWFYSqpa2tw1owhmHNwyNsssj25Uz6qcCBZopl8Vc4zcV4Hu7VxsBIt0IH2kqP2mpmY+PiLMoHW+el0MNgtz1OmzUjGzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619790805; 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=Rg6QnVYdkh/dB7RqHQoM06/4xKP3u0K0wB+xgmRAhjCo+zYrdvBsOphIEydm1RuuOMh9kpRKQ0f+R65IuuX4ofKgUbaYhPfu5+5zdcdVaS5TpP3pkdxBWvuphtPobVmNN5MosOEwHLaY4ESY2Nhak9BAFe6fmfaRLF0ieP2YFf4= 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 1619790805605859.0120631126064; Fri, 30 Apr 2021 06:53:25 -0700 (PDT) Received: from localhost ([::1]:46618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTa8-00019y-HJ for importer@patchew.org; Fri, 30 Apr 2021 09:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTJ1-0005e9-Al for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIv-0008Ds-1J for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:43 -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-584-NAaXOMMJP9iFnvfDx_GIWg-1; Fri, 30 Apr 2021 09:35:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22BB9801B28; Fri, 30 Apr 2021 13:35:31 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id C96415D9E2; Fri, 30 Apr 2021 13:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789736; 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=aMnIInUhK/nCFzf5VuD+i2g0CePEJnx9nK42htw8bz2Ll9I6duCecI0fdBUQsBFSgn7yNG 4ff3s6YpCDj5YNbluNNlDVMtDHEo9/ww2V1/oZ7GSaJuq7rwSI0TvUgRGY0KEjxCPvcoWX LmVGl4OcjoIXCNMq6X1idpRl5uUZlrU= X-MC-Unique: NAaXOMMJP9iFnvfDx_GIWg-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 7/7] tests/acceptance: Handle cpu tag on x86_cpu_model_versions tests Date: Fri, 30 Apr 2021 10:34:14 -0300 Message-Id: <20210430133414.39905-8-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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