From nobody Sat May 4 15:17: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1652720669; cv=none; d=zohomail.com; s=zohoarc; b=PbRBnKpdA/eThMNKK/ZtfrBLk56yA18tP13zxmT/017EUu+wG5EWIgUNFWcEJHY/UEXhdCce0K7pwevHvMWPr2WA/118c5ihILTrvhNrC1nzVwehccRZHkGtWAu+lQXUnuiB68KNAs5fuTPDqTmC94Vgvy24aeZ5NFrYQ6W//7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652720669; h=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=zEsOvcrjsdDHiqYtQBv82TLxP+8TTdVfmUPw6divdy8=; b=Q2hpopmiwraH6zXkCm3FPVjWOin9U6oJShRNhGLJqlDO6JUM11u4gatCzeGKmzPXdYm64ebqohxhSiprYtCQsj+PzArteJ1lUv/tt0B/tKTBqe34IcCiXdGEGgnqJia8z0mgFzAJtug9RWjQBDLMyIN97Aay/x+WUt41Ow26uGs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652720669767140.44333177197905; Mon, 16 May 2022 10:04:29 -0700 (PDT) Received: from localhost ([::1]:38276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqe8y-0005Ax-Oj for importer@patchew.org; Mon, 16 May 2022 13:04:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqdyR-000729-4r; Mon, 16 May 2022 12:53:37 -0400 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]:37881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqdyP-0004j3-N4; Mon, 16 May 2022 12:53:34 -0400 Received: by mail-oi1-x230.google.com with SMTP id r1so19326926oie.4; Mon, 16 May 2022 09:53:33 -0700 (PDT) Received: from balboa.ibmuc.com ([191.193.151.26]) by smtp.gmail.com with ESMTPSA id z14-20020a056870e30e00b000e686d13889sm5780731oad.35.2022.05.16.09.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 09:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zEsOvcrjsdDHiqYtQBv82TLxP+8TTdVfmUPw6divdy8=; b=psBAP7JcSJ8xokaYzS7eOAs5crl97DfI7OgHC4bqMWDQ6/B3umRxVGJ3aajmXWroWR Q/ehuJAwGGVl2M6ZreMlyB12Wgk5VtxRuKbQnbz4zJB5SltO7cyT2I6T9vVuaMDDDLz3 hoYexnoYxOhxzqdYidKsf6ON83fe0QYsvFKrgo4qmaewCGBHc5odIxPIIGueayvdhS7u oLJSEBZfUaXnfOuDP/WYbOyjHbbVR3Tf9hpv74QkCP7Jb9aRRoPF0wx3Rn1UfI6Hoytf 1BWBKbQ75qJ++xOy/mSLMDgr1EPlxPlHEORYTbofv1bIEWWy+I1MLMaGE1X7rMyTTHzq dWRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zEsOvcrjsdDHiqYtQBv82TLxP+8TTdVfmUPw6divdy8=; b=Nd5YSQPQKk+/vUqnXT7XSM6IbPPCCIKeF0WMlziR37MJOSDUh3ig/azwrotaZxWHpF P7c7NVTokmbytkaFAC/BnuS2TDhfMs/Mereac/JbiVG7grlaM3QRZsE2C7CS8TzReUY2 iQITmb3C4rmQKG4KwsA+4ONmBol9Sj6LCSy2PM1+lOSeBGIINLuJaPi4IATtHuEkCac6 CuPjgBPy10RTr5WG8hUVNsMG1WxPRDHYjITV++6ESfNAclnfSbGe+ridS0Hxlp6m+Cj3 6oDwiaCs26cVxomGmSiz9/uMeYAwM+gUEyWxoe/5oQ7LlSJ8bk56hwXeubMLzaIlcs2T 82cw== X-Gm-Message-State: AOAM530ze8hxRLB5WAWIXKTxa8PaYt6aeBfpgueiY4O7UsEvZTAzSUGF kMzWG85VhNNO0NA/5G/beM3GeAkkLYo= X-Google-Smtp-Source: ABdhPJzEM4GmS5hguXu/u5j76lXev0vNtFMJgKFXqHxO7TbENmCON72S9hkayDWO5QPfB0AkbbG7nA== X-Received: by 2002:a05:6808:168b:b0:2f7:338b:7a55 with SMTP id bb11-20020a056808168b00b002f7338b7a55mr14228340oib.133.1652720012312; Mon, 16 May 2022 09:53:32 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, clg@kaod.org, jsnow@redhat.com, crosa@redhat.com, f4bug@amsat.org, wainersm@redhat.com, bleal@redhat.com, Daniel Henrique Barboza Subject: [PATCH 1/5] avocado/empty_cpu_model.py: use machine:none tag Date: Mon, 16 May 2022 13:53:17 -0300 Message-Id: <20220516165321.872394-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220516165321.872394-1-danielhb413@gmail.com> References: <20220516165321.872394-1-danielhb413@gmail.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::230; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x230.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1652720670986100001 Content-Type: text/plain; charset="utf-8" Using tags=3Dmachine:none will do two things: it will avoid the need to passing '-machine none' via self.vm.add_args() and it will set the self.machine attribute of the parent QEMUSystemTest class (via its setUp() method). We'll be relying on self.machine being set apropriately for an upcoming fix. Signed-off-by: Daniel Henrique Barboza --- tests/avocado/empty_cpu_model.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/avocado/empty_cpu_model.py b/tests/avocado/empty_cpu_mod= el.py index 22f504418d..723ecc73af 100644 --- a/tests/avocado/empty_cpu_model.py +++ b/tests/avocado/empty_cpu_model.py @@ -10,8 +10,11 @@ from avocado_qemu import QemuSystemTest =20 class EmptyCPUModel(QemuSystemTest): + """ + :avocado: tags=3Dmachine:none + """ def test(self): - self.vm.add_args('-S', '-display', 'none', '-machine', 'none', '-c= pu', '') + self.vm.add_args('-S', '-display', 'none', '-cpu', '') self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() --=20 2.32.0 From nobody Sat May 4 15:17: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1652721570; cv=none; d=zohomail.com; s=zohoarc; b=aDWDtkRbopMlRlKjueP257Qx4Q7/KyVXfV0MLIOhao1/Nkg2RcPgLi2VnqDZzf4+mIGho9Kc5IgUjXqP7aTup2PS3SZcmJyaQDfFKKYDULc9W3o0mbrtuA95TzGZiixXYkAfFb4dNDv/l67gYtj/6csA+adLhSAclxKzBxnvt+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652721570; h=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=Pe7kD73hoVtMo2myBqhnPDJMPaoRk8lWfcPLt024a5E=; b=eLuL3xPDxmrUDLZRWTzrVZ/Tsrnbdd/2E0BzWkg/+itkmlGCCb3NlSVa3i+xR8gjrptaBi1cOVy2QG2dn7s/Q8Hiz2PUrAQ75zrRWgu5ta+KMOcVJVXrQyXDKYTl/ToI3Iw1eo2Ryh4RVbv3RoXL0NAgz4aVQkRz6CbyU7B2A00= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652721570596253.42028882626187; Mon, 16 May 2022 10:19:30 -0700 (PDT) Received: from localhost ([::1]:49700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqeNV-0007F5-Ii for importer@patchew.org; Mon, 16 May 2022 13:19:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqdyY-00072g-2B; Mon, 16 May 2022 12:53:53 -0400 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]:44798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqdyT-0004jJ-1l; Mon, 16 May 2022 12:53:38 -0400 Received: by mail-ot1-x32d.google.com with SMTP id p12-20020a9d4e0c000000b00606b40860a3so10455818otf.11; Mon, 16 May 2022 09:53:36 -0700 (PDT) Received: from balboa.ibmuc.com ([191.193.151.26]) by smtp.gmail.com with ESMTPSA id z14-20020a056870e30e00b000e686d13889sm5780731oad.35.2022.05.16.09.53.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 09:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pe7kD73hoVtMo2myBqhnPDJMPaoRk8lWfcPLt024a5E=; b=pYsCn0fR3kLXkWxFnnpirnMLA+ucCZTQ8xotdVFQ9dpLsfskiJvtoqddgyQmVq6IWJ oUJvOMlDEpfSqO0xwQZwoJs1LUL2WXJhdnuncKQQbLe3rcbQJoEN7423pKrQK/T899E8 AvF3aKtrzoCjG1a3wcprHGtg8yhImw5th58xAu50Eoq86qhysBNQ1o2qlxJFzswmXij6 cE1ErfVGml40MO26XtkonNAqvgCVUJj5wn6Poe0ranQudA7laRpEBr59gIkQg1jJR6Ak bjRt6O9fZeUHkZ20NIXQ9IrMUdI1N8PtPP40vtEY29C8BKHmfgXO2kSQzDiKp14gIqBH A6aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pe7kD73hoVtMo2myBqhnPDJMPaoRk8lWfcPLt024a5E=; b=y/R6X0C3vCnIFkKrsWNV45b+g0No5nEUxoopejRQ00Shzcc4Vm/0JJBY7LmbNouQ+T P4oksNSMRJVhHdqw60jQ8YwPHU7WiTMqbdD7aj2Uqd6u9G1WQzOG8HtoZU5otITf4ZY6 H3Yx0tnAOKk6UrDVcKxIhzHjVemtRj/eJ0VKqymim9hAaM65maVe6EllNZD5CkJTqpco pdIIJNPx90Wa6abRedGB3sUYWPsi8DkdNZGJ5C+CTnq5QYFve1Hgc19rkldMH+yQbL2U QRriYB+sfTcNI/tb8IQ3itK9qUs+LwVMt8VWdPt8oK6ThowcXaE7l8sQgdANQ9QeiYfO dwfw== X-Gm-Message-State: AOAM531CqdqRnFbMwEEdWqVGzIewXtVRZ5MTBhThpGmeDMfQ317vwcCz DVjc1E5Na9FM3Su8Ao9MSnUqeKhEWK4= X-Google-Smtp-Source: ABdhPJxEC7D6jiA/hwjyxBvcMcubpRE7Seggx9uah0mvsb/oYjJmxr6/EsOdwMGhHj0oVTL5Bun7Sg== X-Received: by 2002:a05:6830:2705:b0:606:5c00:e45d with SMTP id j5-20020a056830270500b006065c00e45dmr6433409otu.375.1652720015318; Mon, 16 May 2022 09:53:35 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, clg@kaod.org, jsnow@redhat.com, crosa@redhat.com, f4bug@amsat.org, wainersm@redhat.com, bleal@redhat.com, Daniel Henrique Barboza Subject: [PATCH 2/5] machine.py: add default pseries params in machine.py Date: Mon, 16 May 2022 13:53:18 -0300 Message-Id: <20220516165321.872394-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220516165321.872394-1-danielhb413@gmail.com> References: <20220516165321.872394-1-danielhb413@gmail.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::32d; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x32d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1652721571230100001 Content-Type: text/plain; charset="utf-8" pSeries guests set a handful of machine capabilities on by default, all of them related to security mitigations, that aren't always available in the host. This means that, as is today, running avocado in a Power9 server without the proper firmware support, and with --disable-tcg, this error will occur: (1/1) tests/avocado/info_usernet.py:InfoUsernet.test_hostfwd: ERROR: Conne= ctError: Failed to establish session: EOFError\n Exit code: 1\n (...) (...) Command: ./qemu-system-ppc64 -display none -vga none (...) Output: qemu-system-ppc64: warning: netdev vnet has no peer qemu-system-ppc64: Requested safe cache capability level not supported by K= VM Try appending -machine cap-cfpc=3Dbroken info_usernet.py happens to trigger this error first, but all tests would fail in this configuration because the host does not support the default 'cap-cfpc' capability. A similar situation was already fixed a couple of years ago by Greg Kurz (commit 63d57c8f91d0) but it was focused on TCG warnings for these same capabilities and running C qtests. This commit ended up preventing the problem we're facing with avocado when running qtests with KVM support. This patch does a similar approach by amending machine.py to disable these security capabilities in case we're running a pseries guest. The change is made in the _launch() callback to be sure that we're already commited into launching the guest. It's also worth noticing that we're relying on self._machine being set accordingly (i.e. via tag:machine), which is currently the case for all ppc64 related avocado tests. Signed-off-by: Daniel Henrique Barboza Tested-by: Matheus Ferst --- python/qemu/machine/machine.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index 07ac5a710b..12e5e37bff 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -51,6 +51,11 @@ =20 =20 LOG =3D logging.getLogger(__name__) +PSERIES_DEFAULT_CAPABILITIES =3D ("cap-cfpc=3Dbroken," + "cap-sbbc=3Dbroken," + "cap-ibs=3Dbroken," + "cap-ccf-assist=3Doff," + "cap-fwnmi=3Doff") =20 =20 class QEMUMachineError(Exception): @@ -447,6 +452,14 @@ def _launch(self) -> None: """ Launch the VM and establish a QMP connection """ + + # pseries needs extra machine options to disable Spectre/Meltdown + # KVM related capabilities that might not be available in the + # host. + if "qemu-system-ppc64" in self._binary: + if self._machine is None or "pseries" in self._machine: + self._args.extend(['-machine', PSERIES_DEFAULT_CAPABILITIE= S]) + self._pre_launch() LOG.debug('VM launch command: %r', ' '.join(self._qemu_full_args)) =20 --=20 2.32.0 From nobody Sat May 4 15:17: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1652722409; cv=none; d=zohomail.com; s=zohoarc; b=EwaaKwGjXpj4fSHSRr+YgFdJQfWx5o6alR+GiB8yHR670BI9J2KEXaXh0butOL6UVGikBN015QNxDH8ljQ4+G6uiViR0thIAI8tTUhI2bg/ZL1zc1Uo8G77zDBzdYRtUbEzfEw3Bk22kYMHZvOhNTPpoJ0dr3qN9c5zi3zY/ik4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652722409; h=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=zCe6NHhLiF0+F7HHkirak470jel11NIdMJKVIPkP5tM=; b=YAlc+3JHx4PIBxJNv2GuDSC7E+wF1iTnSBQZofo/mpZhS//ai3wyJPLOft4eSYlUpNs4SbWdy0Kqyd6MmWRX43ZIBmAg42GYdqtUQ1KwBoYer1p5yC4pyo3cGU5ul8Av10nLWNbviZQQLJDq+UUG9Hvt6pmd9073m3dfzr9Kt7E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165272240920154.59953636745058; Mon, 16 May 2022 10:33:29 -0700 (PDT) Received: from localhost ([::1]:52928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqeb2-0003w9-21 for importer@patchew.org; Mon, 16 May 2022 13:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqdyc-00072l-3w; Mon, 16 May 2022 12:53:56 -0400 Received: from mail-ot1-x330.google.com ([2607:f8b0:4864:20::330]:39544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqdyY-0004jb-61; Mon, 16 May 2022 12:53:45 -0400 Received: by mail-ot1-x330.google.com with SMTP id z15-20020a9d65cf000000b00605f064482cso10445103oth.6; Mon, 16 May 2022 09:53:39 -0700 (PDT) Received: from balboa.ibmuc.com ([191.193.151.26]) by smtp.gmail.com with ESMTPSA id z14-20020a056870e30e00b000e686d13889sm5780731oad.35.2022.05.16.09.53.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 09:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zCe6NHhLiF0+F7HHkirak470jel11NIdMJKVIPkP5tM=; b=fRp3hVhXAdD2+3GThTmIf00nu0r8rK/bXiJrHlcTCQu5oL8NAPK2VID+TKvqsUOVz8 jEKoUMipeQ44ldMHyP6xGSdcjmOxCu7HXw8rY3Lm3PBKKQxxrpoXusm+2l8rrm+uVBUs Jm29eapt/paHfiDatbh046YMfPIIHXmuskrvZ82GJ8BXigCtepR3uja3mddIUI2P3gD/ cXhkkW8pcLdNF/dbcsMhEN6qGTHN+u5+YN9Zca3/suIo8i/BtI1732KGSajxowAuVdxi U7V8gX/rr55QjT/AVtayn7bkuE8opFthvokq95e3Kkfr/B85R7479sqduw+1DaMG6rCl 7xdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zCe6NHhLiF0+F7HHkirak470jel11NIdMJKVIPkP5tM=; b=y8SbTgmmGskjMWX8mN5ouZTgEqiZrAp2jQY/Tq3IdTvlZJBAkBEBrAvkvX57NTUTMt PNdVemGngToQLE0XYAvORELnGqCV6dYNw5KgKBFXUf78UK/hGWehIjqGbsrCGXcAt6jO DICjEvFYoRfPzBt7yPrMEosFu/XfgSc6+bMYLlJuC7Z30+FVA+DJ+ylx563M5Gz+a7va kOx0GWzlqLxNjE42BDX0d4zE38Xy4Ato62a7XCSBTnxxMYVz3L7UOUkl7m2hpklL3f2k SGbeQRtVJeGK3LhVxiSkI2ksoPHXxPFrGKI5sUyPWk+7nMqIk/tKttGu6vlf4/Igae7S 3eXQ== X-Gm-Message-State: AOAM5304I7JzNSBywTqetgDr0eawz8ULte42Y0X6IfJ2h63+pFC1B95h 5hm3MttotzAxvRxVjWw7T7/MZGwZ5aM= X-Google-Smtp-Source: ABdhPJyS9BaKiNh58fFTjBd0avbW/SkgAiq+vGGsEzGznN3j73i12MnuSEnZ9ML3ZbUPbMMNYAUxIQ== X-Received: by 2002:a9d:1b09:0:b0:606:e384:138e with SMTP id l9-20020a9d1b09000000b00606e384138emr6119432otl.141.1652720018236; Mon, 16 May 2022 09:53:38 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, clg@kaod.org, jsnow@redhat.com, crosa@redhat.com, f4bug@amsat.org, wainersm@redhat.com, bleal@redhat.com, Daniel Henrique Barboza Subject: [PATCH 3/5] avocado/multiprocess.py: use tags=machine:pc|virt Date: Mon, 16 May 2022 13:53:19 -0300 Message-Id: <20220516165321.872394-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220516165321.872394-1-danielhb413@gmail.com> References: <20220516165321.872394-1-danielhb413@gmail.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::330; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x330.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1652722409794100001 Content-Type: text/plain; charset="utf-8" Assigning the machine type via the avocado tag will set self.machine from QEMUSystemTest and avoid the need to set the machine type by using self.vm.add_args(). do_test() was changed to receive a 'machine_opts' that will allow the aarch64 test to pass the additional '-machine gic-version=3D3' parameter it requires. Signed-off-by: Daniel Henrique Barboza --- tests/avocado/multiprocess.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/avocado/multiprocess.py b/tests/avocado/multiprocess.py index 80a3b8f442..9a7cc6becb 100644 --- a/tests/avocado/multiprocess.py +++ b/tests/avocado/multiprocess.py @@ -19,7 +19,7 @@ class Multiprocess(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 def do_test(self, kernel_url, initrd_url, kernel_command_line, - machine_type): + machine_opts=3DNone): """Main test method""" self.require_accelerator('kvm') =20 @@ -43,7 +43,8 @@ def do_test(self, kernel_url, initrd_url, kernel_command_= line, =20 # Create proxy process self.vm.set_console() - self.vm.add_args('-machine', machine_type) + if machine_opts: + self.vm.add_args('-machine', machine_opts) self.vm.add_args('-accel', 'kvm') self.vm.add_args('-cpu', 'host') self.vm.add_args('-object', @@ -67,6 +68,7 @@ def do_test(self, kernel_url, initrd_url, kernel_command_= line, def test_multiprocess_x86_64(self): """ :avocado: tags=3Darch:x86_64 + :avocado: tags=3Dmachine:pc """ kernel_url =3D ('https://archives.fedoraproject.org/pub/archive/fe= dora' '/linux/releases/31/Everything/x86_64/os/images' @@ -76,12 +78,12 @@ def test_multiprocess_x86_64(self): '/pxeboot/initrd.img') kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'console=3DttyS0 rdinit=3D/bin/bash') - machine_type =3D 'pc' - self.do_test(kernel_url, initrd_url, kernel_command_line, machine_= type) + self.do_test(kernel_url, initrd_url, kernel_command_line) =20 def test_multiprocess_aarch64(self): """ :avocado: tags=3Darch:aarch64 + :avocado: tags=3Dmachine:virt """ kernel_url =3D ('https://archives.fedoraproject.org/pub/archive/fe= dora' '/linux/releases/31/Everything/aarch64/os/images' @@ -91,5 +93,5 @@ def test_multiprocess_aarch64(self): '/pxeboot/initrd.img') kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'rdinit=3D/bin/bash console=3DttyAMA0') - machine_type =3D 'virt,gic-version=3D3' - self.do_test(kernel_url, initrd_url, kernel_command_line, machine_= type) + machine_opts =3D 'gic-version=3D3' + self.do_test(kernel_url, initrd_url, kernel_command_line, machine_= opts) --=20 2.32.0 From nobody Sat May 4 15:17: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1652721145; cv=none; d=zohomail.com; s=zohoarc; b=WzBZNpsPFuA2Mx1D5rQewJGmC5HIdGJSUia3VZoIHMTo1jZDGhsroFFc3L5qfwRZyeWmIlK4VCwQICvuBnONTlh2KEMeJRWzD35c0Rhn0lVWFHOveNj7JrjpaERav6aGi1MiYT959Ea4Q3ntU4Oy74TaTWnt6pgooMDS2GyeZE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652721145; h=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=zjPwgG7Uozx59CsKqY2HRFz6jk2tqMNNSJVd3GOd5Ak=; b=V1/ivYpAWAlLKPNbnzYsvW6rtHmz7g4uEgLpvEUUJSB5d8Obpb2d597eqdyuFvpXQ0Fglc2/ndyv79eQHQKa2eKrVqoz9Inzapo0dtIt4GRQ3I/l6jbe7EG2sw6gQQwP2xZh02rKVaJn2MnxCsKUS9yau0Zl9j1wgsdyOq8pZUU= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652721145087686.1106709793704; Mon, 16 May 2022 10:12:25 -0700 (PDT) Received: from localhost ([::1]:55640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqeGe-0000Qv-3G for importer@patchew.org; Mon, 16 May 2022 13:12:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqdyc-00072m-FF; Mon, 16 May 2022 12:53:57 -0400 Received: from mail-oa1-x33.google.com ([2001:4860:4864:20::33]:41483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqdya-0004jm-UA; Mon, 16 May 2022 12:53:46 -0400 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-edf9ddb312so20903849fac.8; Mon, 16 May 2022 09:53:42 -0700 (PDT) Received: from balboa.ibmuc.com ([191.193.151.26]) by smtp.gmail.com with ESMTPSA id z14-20020a056870e30e00b000e686d13889sm5780731oad.35.2022.05.16.09.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 09:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zjPwgG7Uozx59CsKqY2HRFz6jk2tqMNNSJVd3GOd5Ak=; b=lrO2w5bry3y/TWETNAWQwstF8WdvUFkepz7ny/NBsuA59nqFUKogU+5CB+uiaSi5FE Q4RokVh5z98YM+Jc97cGEtM0sBUD6Mz3AkacvyKy8NsFXhe3vzFpX+IayijhZuYqfhcb weVc8xO7gOCQQEwcYARDqoNllFkRTyoAwkO0jZqwB34LyzvIkL8snPLHKBkxlRe0iba1 DHtc/3A7fzWcNHfP/kLPgLp7txcKiRwJvMDxwiAMO3VonIfFWF5XUfcLqsJEqvR6fwvN jDFT1CZHaHMtkMP44IgZAPCDzIEFmHRldq4kQAXiRzxeQpkMxCNsf6G3R3yL+KWkzTwB EEOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zjPwgG7Uozx59CsKqY2HRFz6jk2tqMNNSJVd3GOd5Ak=; b=G/obPqvkd8iFrlTt2xEpHPlwDMwN4dPnz5hjcIeAruJ8CmMn4lUj9zFmuIm2IC7pvq dit4OW09YBIsAkfbY3SC57jboOE46on3cuABRCEnENj8ld2VwsZYMbTyTuay6ZaM9dvW ASKjkRGk/X9rSDmLM6xYBTLe79qZQeI4H+JFE9eN9j3VVwMwEJOlnjf/A+11n19SYAzV EsJi9r9EJFGghC/WSz/KRwNEdX+SG2/EpPDBZr19+YnpF6M014JbGHGB0ids2v8fRABM Yya2f2EPvOfeDduEcxALDRJAYr6CpJCPiZ7b5yITvRTjRwl3t0IGeeO+ZDjIbS58miUR 0PTQ== X-Gm-Message-State: AOAM530wdRji9CXWmmM1ATrQW/H3KStLWJEHg0XIfs5RySspKlad91tt QwuFa9mlV6TgrqJdSLAR85Z6WZLX1uE= X-Google-Smtp-Source: ABdhPJwtdax3X3qht4egNMWMCPHcDajGXx5stHzjXe0m4gyfyyTi5hgM9ys645Hn4e+AAS5Sws8rRg== X-Received: by 2002:a05:6871:8a5:b0:f1:8d80:b5d4 with SMTP id r37-20020a05687108a500b000f18d80b5d4mr5098464oaq.133.1652720021397; Mon, 16 May 2022 09:53:41 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, clg@kaod.org, jsnow@redhat.com, crosa@redhat.com, f4bug@amsat.org, wainersm@redhat.com, bleal@redhat.com, Daniel Henrique Barboza Subject: [PATCH 4/5] avocado/boot_linux.py: avocado tag fixes in BootLinuxAarch64 Date: Mon, 16 May 2022 13:53:20 -0300 Message-Id: <20220516165321.872394-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220516165321.872394-1-danielhb413@gmail.com> References: <20220516165321.872394-1-danielhb413@gmail.com> MIME-Version: 1.0 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=2001:4860:4864:20::33; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x33.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1652721145557100001 Content-Type: text/plain; charset="utf-8" BootLinuxAarch64 is already setting machine:virt in the avocado tags, meaning that we don't need to add '-machine virt' via add_args(). It's also adding an extra '-machine gic-version=3D2' parameter via an avocado tag, which is not ideal because: - it prevents self.machine from QEMUSystemTest to be set since there are multiple 'machine' avocado tests being set; - the tests are using different 'gic-version' setting, meaning that we're still needing to add '-machine gic-version=3DN' via add_args() regardless. Removing the 'machine=3Dgic-version=3D2' tag allows us to set 'self.machine' without adding extra work. Signed-off-by: Daniel Henrique Barboza --- tests/avocado/boot_linux.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index ee584d2fdf..1fbedbab5c 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -61,7 +61,6 @@ class BootLinuxAarch64(LinuxTest): """ :avocado: tags=3Darch:aarch64 :avocado: tags=3Dmachine:virt - :avocado: tags=3Dmachine:gic-version=3D2 """ =20 def add_common_args(self): @@ -80,7 +79,7 @@ def test_virt_tcg_gicv2(self): self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") self.vm.add_args("-cpu", "max,lpa2=3Doff") - self.vm.add_args("-machine", "virt,gic-version=3D2") + self.vm.add_args("-machine", "gic-version=3D2") self.add_common_args() self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 @@ -93,7 +92,7 @@ def test_virt_tcg_gicv3(self): self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") self.vm.add_args("-cpu", "max,lpa2=3Doff") - self.vm.add_args("-machine", "virt,gic-version=3D3") + self.vm.add_args("-machine", "gic-version=3D3") self.add_common_args() self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 @@ -104,7 +103,7 @@ def test_virt_kvm(self): """ self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") - self.vm.add_args("-machine", "virt,gic-version=3Dhost") + self.vm.add_args("-machine", "gic-version=3Dhost") self.add_common_args() self.launch_and_wait(set_up_ssh_connection=3DFalse) =20 --=20 2.32.0 From nobody Sat May 4 15:17: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1652720953; cv=none; d=zohomail.com; s=zohoarc; b=m2SnmlF5g8URwhgiCvO2Cd6fttktoJBnfmr5YMMKjCv1DSCnsOSBGXJYW4NL35n5Q9UxvzJAaVkrWw3Yn6rmnIjYOsmxLOgP9np0y4enzTkzVK8EM/fmJYnri1kIYErMZ7a5p+/zlFgvBFaLamDTvbn+IjafjiZUe+05ccKuKEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652720953; h=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=oNahl/oMgHdaCwKlQVU9KibBrsxyojlRuwuYCn3qz9I=; b=HYE5+FrmHIbi8lJsIkGsIjC9XL7/i7cg0m/vYXvLHLFI/Rf8mbrfxu0wZvAMPmf1gB6ooWSxNU1M9bKQDlZMleE8QuagAq/cjaxdnxGL2sKto8AwSb5GRJNzSTKnCh4Nk++wIUT2eVU3GXrCYujuBZ0rfS2/v8pQ3c+DBFIXIjg= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652720953118850.6026688731348; Mon, 16 May 2022 10:09:13 -0700 (PDT) Received: from localhost ([::1]:46992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqeDY-0002tZ-0T for importer@patchew.org; Mon, 16 May 2022 13:09:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqdyd-00072p-Df; Mon, 16 May 2022 12:53:57 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]:40698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqdyb-0004jv-Rd; Mon, 16 May 2022 12:53:47 -0400 Received: by mail-oi1-x22a.google.com with SMTP id y63so19303253oia.7; Mon, 16 May 2022 09:53:45 -0700 (PDT) Received: from balboa.ibmuc.com ([191.193.151.26]) by smtp.gmail.com with ESMTPSA id z14-20020a056870e30e00b000e686d13889sm5780731oad.35.2022.05.16.09.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 09:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oNahl/oMgHdaCwKlQVU9KibBrsxyojlRuwuYCn3qz9I=; b=E7F2s1+d0FoGnFv35XkR4sJwh3nIaRJBhdHoDDUYwXcH6zUpzh2A5sqpwAo1ALXgSa liRs+jnKN5M3fzCJDDTkFzRdA8xOnR6bTqoiuFexDIidBfUQ6tilb8E0/48nt0yW9YT1 Q7dQbkPmxEe2RqvruY2bS5lVYYA15o7zNLbF5JKwAlqXjpR/Vj+hAcoejs8T/vwE8JHi 6cRnGXS1c+t9T7aSMOyctUAtgMpZMhHShJNxtApEcacVkwi6O8LBKpWzBj8x0xvJ8ELX EQUSouQPeOyrVZdCLE1Kwm0FLIz+G2GgtGmTdSLCmbRI9S/SySUoscur6eZT7Phyb9vj UQcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oNahl/oMgHdaCwKlQVU9KibBrsxyojlRuwuYCn3qz9I=; b=SuePbgSkyI5U3AfwSUzI4pfRHnGaFRpHottwMpGoefEnUbp/AA0pDScJxKYevNrJt4 nmakOSNBYTmErv3Y+k9CxMsKQRodNdnxNXMyKyX6OXxbQS+wsaeQsvbyRLdRl1WTVLSl ERQtSmNIVqZ3XcViaVYkKyoxuOofZtsM985jp+dFn8UVZMEifzb9gQqOk+W4O24COftD 0CldYsyPeIa2FOA7+pG0Eb0Nnmw2ts1D5gi8uK2Hd8S3FACannu9YrLtCyPyP/Bwm851 IWcHec2l1DsvKQb/MgV9bfvtGTrXwLKVnC+qbiDKJHd+13/4065M13T5s3vkz8b8iH84 A/mg== X-Gm-Message-State: AOAM533UQ0QN1Q/VZce3wZaSKV3jcYHKrlukFKl07T3ZrYd2mIfTbYMX u53/JtnoI42uErj4E8gowd/0bstF+8Y= X-Google-Smtp-Source: ABdhPJxHf/ID9zJ+pYfLdvest/NlfgcIfhgn66rHBCi5s3fJc5K2vKnsCC5hbW7yfqhdbgWtM5vTjg== X-Received: by 2002:a54:4688:0:b0:325:9a36:ecfe with SMTP id k8-20020a544688000000b003259a36ecfemr8937409oic.96.1652720024439; Mon, 16 May 2022 09:53:44 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, clg@kaod.org, jsnow@redhat.com, crosa@redhat.com, f4bug@amsat.org, wainersm@redhat.com, bleal@redhat.com, Daniel Henrique Barboza Subject: [PATCH 5/5] avocado/virtio-gpu.py: use tags=machine:pc Date: Mon, 16 May 2022 13:53:21 -0300 Message-Id: <20220516165321.872394-6-danielhb413@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220516165321.872394-1-danielhb413@gmail.com> References: <20220516165321.872394-1-danielhb413@gmail.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::22a; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1652720954484100001 Content-Type: text/plain; charset="utf-8" Using tags=3Dmachine:pc will do two things: it will avoid the need to passing '-machine pc' via self.vm.add_args() and it will set the self.machine attribute of the parent QEMUSystemTest class (via its setUp() method). Signed-off-by: Daniel Henrique Barboza --- tests/avocado/virtio-gpu.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/avocado/virtio-gpu.py b/tests/avocado/virtio-gpu.py index 2a249a3a2c..a88f43d312 100644 --- a/tests/avocado/virtio-gpu.py +++ b/tests/avocado/virtio-gpu.py @@ -59,6 +59,7 @@ def wait_for_console_pattern(self, success_message, vm=3D= None): def test_virtio_vga_virgl(self): """ :avocado: tags=3Ddevice:virtio-vga-gl + :avocado: tags=3Dmachine:pc """ # FIXME: should check presence of virtio, virgl etc self.require_accelerator('kvm') @@ -68,7 +69,7 @@ def test_virtio_vga_virgl(self): =20 self.vm.set_console() self.vm.add_args("-m", "2G") - self.vm.add_args("-machine", "pc,accel=3Dkvm") + self.vm.add_args("-machine", "accel=3Dkvm") self.vm.add_args("-device", "virtio-vga-gl") self.vm.add_args("-display", "egl-headless") self.vm.add_args( @@ -94,6 +95,7 @@ def test_virtio_vga_virgl(self): def test_vhost_user_vga_virgl(self): """ :avocado: tags=3Ddevice:vhost-user-vga + :avocado: tags=3Dmachine:pc """ # FIXME: should check presence of vhost-user-gpu, virgl, memfd etc self.require_accelerator('kvm') @@ -131,7 +133,7 @@ def test_vhost_user_vga_virgl(self): self.vm.set_console() 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") + self.vm.add_args("-machine", "memory-backend=3Dmem,accel=3Dkvm") self.vm.add_args("-chardev", "socket,id=3Dvug,fd=3D%d" % qemu_sock= .fileno()) self.vm.add_args("-device", "vhost-user-vga,chardev=3Dvug") self.vm.add_args("-display", "egl-headless") --=20 2.32.0