From nobody Wed Apr 2 13:16:58 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1743062857; cv=none; d=zohomail.com; s=zohoarc; b=YjkfYkfyMVEWhXs22G4fJUMIwPQxDso2ojfVcCTpfZgozLqc47p4XuxTlhbjuCOrL2WBmmSLzfw78VzWhnseYxWWzxvf7s/k0llQ32KydjsN/HBBpnel/iTZvj09W8jpI5bd+RbqZne4gO95IsWt3SDzxh6Jo8S/2aM73yiQKBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743062857; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EmC7BeGrHtiYw29etxp23105ZudT3hmL7Ks2UIdZshM=; b=jie9lMcVEqg7bkbGqadck4DYUTVAWwg57nMfIPeHrSnpnq0OYfGiUzntQ3sEVYkP7ztm864wBmnCuoNAk8fA2uWEhQQR8rYVKGjMqMrJU4ZW6+O2JgJgty0/kYa5FrsKJge5KWPviDKlC+JVpRjFemQ28w+4gAiYluOaDaFAQ9c= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1743062857044723.997952956064; Thu, 27 Mar 2025 01:07:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiGq-00019V-Cb; Thu, 27 Mar 2025 04:07:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGg-00012n-AR for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:07:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGc-00067C-4P for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:07:11 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-541-ll-5yHE_NQq0AyFhGZ2VzQ-1; Thu, 27 Mar 2025 04:06:34 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C91451801A06 for ; Thu, 27 Mar 2025 08:06:28 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.126]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 525E619560AD; Thu, 27 Mar 2025 08:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743062826; 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=EmC7BeGrHtiYw29etxp23105ZudT3hmL7Ks2UIdZshM=; b=f72PEjFsJoZOLIFH3sJxQl+YlsAprFb7kTlwY/kftEjXaBmBWObXJssFw1OcBYXIx6WeVh Y3LHJeydZLfdJocZgQGQ6X8GTq/PQsHbLJwjI9tCNnDJE0Pzn1QUthEFH1iY9oNYXdGzDA 33nMYxGgnndBJ0nTIm8kN5Sk2y2wK0Y= X-MC-Unique: ll-5yHE_NQq0AyFhGZ2VzQ-1 X-Mimecast-MFC-AGG-ID: ll-5yHE_NQq0AyFhGZ2VzQ_1743062794 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 1/6] tests/functional/test_ppc64_replay: Mark the e500 test as flaky Date: Thu, 27 Mar 2025 09:06:17 +0100 Message-ID: <20250327080622.954388-2-thuth@redhat.com> In-Reply-To: <20250327080622.954388-1-thuth@redhat.com> References: <20250327080622.954388-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1743062859290019100 From: Thomas Huth The test_ppc64_e500 occasionally fails (it just hangs and finally times out). The same issue could also be reproduced with the former Avocado test already (especially if the host system is under heavy load), so it's not a new regression. It's very likely the issue that has been filed at https://gitlab.com/qemu-project/qemu/-/issues/2523 instead (e.g. I could not reproduce the issue in older commits before commit 578912ad), so use this URL for the reasoning in the the decorator. Message-ID: <20250320065012.309520-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- tests/functional/test_ppc64_replay.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/functional/test_ppc64_replay.py b/tests/functional/test_= ppc64_replay.py index 48ce1b7f1e1..e8c9c4bcbf8 100755 --- a/tests/functional/test_ppc64_replay.py +++ b/tests/functional/test_ppc64_replay.py @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later =20 -from qemu_test import Asset +from qemu_test import Asset, skipFlakyTest from replay_kernel import ReplayKernelBase =20 =20 @@ -16,6 +16,7 @@ class Ppc64Replay(ReplayKernelBase): 'day19.tar.xz'), '20b1bb5a8488c664defbb5d283addc91a05335a936c63b3f5ff7eee74b725755') =20 + @skipFlakyTest('https://gitlab.com/qemu-project/qemu/-/issues/2523') def test_ppc64_e500(self): self.set_machine('ppce500') self.cpu =3D 'e5500' --=20 2.49.0 From nobody Wed Apr 2 13:16:58 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1743062808; cv=none; d=zohomail.com; s=zohoarc; b=auBqVDzLQAEVrvy1rsKO0zcS8pnvUriaCIoW2QufTmFk9APw2GcCJif3hl796LA8c2oqZ3Ps+R11GjfLNdQOzCi5Tf0hPMStQzMdMpmy8y4UA44dgufy+gaidW6JeLrHjB0dYldO4ysUECSDBeONEpU3zQEJESU+HqaEVcwpM60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743062808; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=x9V7MotqbpNaS9rMOW4DrdfDcaNrXxBF0fRr9vaxQ9Y=; b=kH0DPKkl7t5TYFSiWRQJxtFHih+EmnbUCogpFUTOZDbeF8n8k+F3MdjiuY3hCjCB+h4vCe+oMrFvfHWfOD4OfhfALIrR/Re5GW/tGY0x7tCxx/l7DyAiAE4j9K3N0RpW/aG3GjqQNR59AlMJtBdaQFvOto+HcCdXMWvz+JXV5Zk= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1743062808985513.9819810090387; Thu, 27 Mar 2025 01:06:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiG7-0000Od-Uy; Thu, 27 Mar 2025 04:06:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiG6-0000OU-G3 for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiG4-00062q-Ua for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:38 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-265-isyw6sD7Mk6o9E2cYiZtgA-1; Thu, 27 Mar 2025 04:06:32 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 58384196D2CF; Thu, 27 Mar 2025 08:06:31 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.126]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 56ED119560AB; Thu, 27 Mar 2025 08:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743062796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x9V7MotqbpNaS9rMOW4DrdfDcaNrXxBF0fRr9vaxQ9Y=; b=bHpKOwG1PfixUlXY0cUw8j5C2qWBYsD0J/CyHPRampMyn4VwnZPErzvHVO6ldwjE2aL+KR i8eqEGuhKRG4YuDSU9KvxLtEl33SvDWBZviZYfQkJSFwEeiSnELDm+HEqiRQ+8Brtbew4H 8x8CuyYd6Dk2mwScdEEquFAWZRQAkpI= X-MC-Unique: isyw6sD7Mk6o9E2cYiZtgA-1 X-Mimecast-MFC-AGG-ID: isyw6sD7Mk6o9E2cYiZtgA_1743062791 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Maydell Subject: [PULL 2/6] tests/functional/meson.build: Bump arm_aspeed_bletchley timeout Date: Thu, 27 Mar 2025 09:06:18 +0100 Message-ID: <20250327080622.954388-3-thuth@redhat.com> In-Reply-To: <20250327080622.954388-1-thuth@redhat.com> References: <20250327080622.954388-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1743062810266019000 Content-Type: text/plain; charset="utf-8" From: Peter Maydell The arm_aspeed_bletchley timeout takes more than its current 120s timeout on a debug Rust config: $ time (cd build/rust; PYTHONPATH=3D../../python:../../tests/functional QEM= U_TEST_QEMU_BINARY=3D./qemu-system-arm ./pyvenv/bin/python3 ../../tests/fun= ctional/test_arm_aspeed_bletchley.py) TAP version 13 ok 1 test_arm_aspeed_bletchley.BletchleyMachine.test_arm_ast2600_bletchley_= openbmc 1..1 real 2m15.536s user 3m21.444s sys 0m11.558s Bump it up to 480s, same as arm_aspeed_rainier. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Message-ID: <20250321155806.1888867-1-peter.maydell@linaro.org> Signed-off-by: Thomas Huth --- tests/functional/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 96d28289279..0f8be30fe27 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -26,7 +26,7 @@ test_timeouts =3D { 'arm_aspeed_witherspoon' : 120, 'arm_aspeed_ast2500' : 720, 'arm_aspeed_ast2600' : 1200, - 'arm_aspeed_bletchley' : 120, + 'arm_aspeed_bletchley' : 480, 'arm_aspeed_rainier' : 480, 'arm_bpim2u' : 500, 'arm_collie' : 180, --=20 2.49.0 From nobody Wed Apr 2 13:16:58 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1743062820; cv=none; d=zohomail.com; s=zohoarc; b=KH/GKHyQgwGkUjmqzcgtK+dU8hxHsLAYaczke7rINI/mbd1MUAp3w4Nw59sKgp3lo/5ehWztfoVbuJ+Gj+7vDAQpriWddEFcD6QTcuz+9e72CiWPwLL2uwtCeV223FxMpF+7IgubryMADX8XgVib7WmlNSf6jug8/bsnsB+mK80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743062820; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Uh9WZBy2XlV+60/QKs9gjhj0GiQ0FnBBh7/xX9RfVHY=; b=CvjnKWH7ts5+puMPKHqwfnB1vx9ICEUKuBOGaHfFwv1OTplUPfLAslwRhBWdXXrrF1MJGm2mtpvFZqXksS7j/w6PX9zioQVrY4r16xyqlXs7RUgJRdj1myccjbJJ0iXaMHUGws6pYs2aYAN/UyRs5YQ3rVG5LQUNhlIxcd/2VhU= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1743062820646697.6512544968962; Thu, 27 Mar 2025 01:07:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiGC-0000PI-Kc; Thu, 27 Mar 2025 04:06:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiG8-0000Og-7U for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiG6-000631-AL for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:39 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-KmWIUSGMO4ippRUaqnaD9g-1; Thu, 27 Mar 2025 04:06:35 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E8E7D1809CA6 for ; Thu, 27 Mar 2025 08:06:34 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.126]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 226CF19560AB; Thu, 27 Mar 2025 08:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743062797; 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=Uh9WZBy2XlV+60/QKs9gjhj0GiQ0FnBBh7/xX9RfVHY=; b=V5FPPcOakR5yK/q7XnYkfyCOHyxgI+cqKf3ubK8THDMn3ZcH0tCAmqGwhxrCS0CoFgiUEZ 3swPF+Yx9CGgeoOo8JQ2E/O986xvbvCxYX3QaGP1VvJt+8a0cxAjgTjeX2Q1S9PIVUugML lvjxFJPBPuQknV11IBCT9zOe9mNlacE= X-MC-Unique: KmWIUSGMO4ippRUaqnaD9g-1 X-Mimecast-MFC-AGG-ID: KmWIUSGMO4ippRUaqnaD9g_1743062795 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 3/6] tests/functional: Add missing require_netdev('user') statements Date: Thu, 27 Mar 2025 09:06:19 +0100 Message-ID: <20250327080622.954388-4-thuth@redhat.com> In-Reply-To: <20250327080622.954388-1-thuth@redhat.com> References: <20250327080622.954388-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1743062823370019100 From: Thomas Huth A bunch of tests are using "-netdev user" but fail to check for the availability of SLIRP in the binary, so these tests fail if QEMU has been configured with "--disable-slirp" (most of the tests are disabled by default with a decorator, that's likely why nobody noticed this problem yet). Add the missing self.require_netdev('user') statements to skip the tests if SLIRP is not available. Message-ID: <20250324123450.111307-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- tests/functional/test_aarch64_rme_sbsaref.py | 1 + tests/functional/test_aarch64_rme_virt.py | 4 +++- tests/functional/test_arm_bpim2u.py | 2 ++ tests/functional/test_arm_cubieboard.py | 2 ++ tests/functional/test_arm_orangepi.py | 4 ++++ tests/functional/test_ppc64_hv.py | 3 +++ tests/functional/test_x86_64_kvm_xen.py | 1 + 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/functional/test_aarch64_rme_sbsaref.py b/tests/functiona= l/test_aarch64_rme_sbsaref.py index ddcc9493a6c..0f4f6103a1e 100755 --- a/tests/functional/test_aarch64_rme_sbsaref.py +++ b/tests/functional/test_aarch64_rme_sbsaref.py @@ -33,6 +33,7 @@ class Aarch64RMESbsaRefMachine(QemuSystemTest): def test_aarch64_rme_sbsaref(self): self.set_machine('sbsa-ref') self.require_accelerator('tcg') + self.require_netdev('user') =20 self.vm.set_console() =20 diff --git a/tests/functional/test_aarch64_rme_virt.py b/tests/functional/t= est_aarch64_rme_virt.py index 38e01721a4e..f4ad4d33d58 100755 --- a/tests/functional/test_aarch64_rme_virt.py +++ b/tests/functional/test_aarch64_rme_virt.py @@ -60,8 +60,10 @@ class Aarch64RMEVirtMachine(QemuSystemTest): # and launching a nested VM using it. def test_aarch64_rme_virt(self): self.set_machine('virt') - self.vm.set_console() self.require_accelerator('tcg') + self.require_netdev('user') + + self.vm.set_console() =20 stack_path_tar_gz =3D self.ASSET_RME_STACK_VIRT.fetch() self.archive_extract(stack_path_tar_gz, format=3D"tar") diff --git a/tests/functional/test_arm_bpim2u.py b/tests/functional/test_ar= m_bpim2u.py index 12cd3597460..8de6ccba881 100755 --- a/tests/functional/test_arm_bpim2u.py +++ b/tests/functional/test_arm_bpim2u.py @@ -140,6 +140,8 @@ def test_arm_bpim2u_gmac(self): @skipBigDataTest() def test_arm_bpim2u_openwrt_22_03_3(self): self.set_machine('bpim2u') + self.require_netdev('user') + # This test download a 8.9 MiB compressed image and expand it # to 127 MiB. image_path =3D self.uncompress(self.ASSET_SD_IMAGE) diff --git a/tests/functional/test_arm_cubieboard.py b/tests/functional/tes= t_arm_cubieboard.py index 423db710e82..b87a28154da 100755 --- a/tests/functional/test_arm_cubieboard.py +++ b/tests/functional/test_arm_cubieboard.py @@ -107,6 +107,8 @@ def test_arm_cubieboard_openwrt_22_03_2(self): # This test download a 7.5 MiB compressed image and expand it # to 126 MiB. self.set_machine('cubieboard') + self.require_netdev('user') + image_path =3D self.uncompress(self.ASSET_OPENWRT) image_pow2ceil_expand(image_path) =20 diff --git a/tests/functional/test_arm_orangepi.py b/tests/functional/test_= arm_orangepi.py index 28919391e5d..1815f56e027 100755 --- a/tests/functional/test_arm_orangepi.py +++ b/tests/functional/test_arm_orangepi.py @@ -147,6 +147,8 @@ def test_arm_orangepi_sd(self): @skipBigDataTest() def test_arm_orangepi_armbian(self): self.set_machine('orangepi-pc') + self.require_netdev('user') + # This test download a 275 MiB compressed image and expand it # to 1036 MiB, but the underlying filesystem is 1552 MiB... # As we expand it to 2 GiB we are safe. @@ -181,6 +183,8 @@ def test_arm_orangepi_armbian(self): @skipBigDataTest() def test_arm_orangepi_uboot_netbsd9(self): self.set_machine('orangepi-pc') + self.require_netdev('user') + # This test download a 304MB compressed image and expand it to 2GB # We use the common OrangePi PC 'plus' build of U-Boot for our sec= ondary # program loader (SPL). We will then set the path to the more spec= ific diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc6= 4_hv.py index 62f996adf6d..1920e91f18b 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -125,6 +125,7 @@ def do_test_kvm(self, hpt=3DFalse): =20 def test_hv_pseries(self): self.require_accelerator("tcg") + self.require_netdev('user') self.set_machine('pseries') self.vm.add_args("-accel", "tcg,thread=3Dmulti") self.vm.add_args('-device', 'nvme,serial=3D1234,drive=3Ddrive0') @@ -136,6 +137,7 @@ def test_hv_pseries(self): =20 def test_hv_pseries_kvm(self): self.require_accelerator("kvm") + self.require_netdev('user') self.set_machine('pseries') self.vm.add_args("-accel", "kvm") self.vm.add_args('-device', 'nvme,serial=3D1234,drive=3Ddrive0') @@ -147,6 +149,7 @@ def test_hv_pseries_kvm(self): =20 def test_hv_powernv(self): self.require_accelerator("tcg") + self.require_netdev('user') self.set_machine('powernv') self.vm.add_args("-accel", "tcg,thread=3Dmulti") self.vm.add_args('-device', 'nvme,bus=3Dpcie.2,addr=3D0x0,serial= =3D1234,drive=3Ddrive0', diff --git a/tests/functional/test_x86_64_kvm_xen.py b/tests/functional/tes= t_x86_64_kvm_xen.py index 3bedef6c98c..c6abf6bba3b 100755 --- a/tests/functional/test_x86_64_kvm_xen.py +++ b/tests/functional/test_x86_64_kvm_xen.py @@ -41,6 +41,7 @@ class KVMXenGuest(QemuSystemTest): def common_vm_setup(self): # We also catch lack of KVM_XEN support if we fail to launch self.require_accelerator("kvm") + self.require_netdev('user') =20 self.vm.set_console() =20 --=20 2.49.0 From nobody Wed Apr 2 13:16:58 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1743062873; cv=none; d=zohomail.com; s=zohoarc; b=OWhj80LAkVcZF4Vvc/a+IO4a1f0EGEUhteRCgbzQF4L56zfHVMHL3JG0e11uEu/JxQZnTOGGfi2tTS4StaqP/yfKWX/CPIRcyQ5bP629Sm3qLUoHY8rcCrBltSDCs9onC5wDpatwKZBUBeOu5mb4PfTjTbGk8RDr0yyDztECcQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743062873; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5S2YTUPcuaxTiF8r6KziZLG4pscjDNlMS7Y1tYg2uFA=; b=TBh2e9torwDXDafbZXhmTR3bvUZyve+T4CS+0nMDMFStaL56ddqQiWyjj9Tbdg079YZr0z66Wp/HxicmTav3zskEbaJ7mOf5M2H7EB1bn97P3nhDPryCCH2HSpt+AQdDhd6IHQ5QAgXvDCl6ZJTVvgMcmALgzbzHjbyeDSvrgL8= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1743062873348248.1374863490214; Thu, 27 Mar 2025 01:07:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiGT-0000aK-8y; Thu, 27 Mar 2025 04:07:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGQ-0000Vd-G3 for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGP-00065H-13 for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:58 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-fCwizl3rO9ikcdOf7GWCyQ-1; Thu, 27 Mar 2025 04:06:38 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9DF021801A1A; Thu, 27 Mar 2025 08:06:37 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.126]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6DF7619560AB; Thu, 27 Mar 2025 08:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743062816; 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=5S2YTUPcuaxTiF8r6KziZLG4pscjDNlMS7Y1tYg2uFA=; b=TFVRgm1aprUM828j6fItSLoVWdf8HGLyhxM0VO41DbBq9RV3HOM5GLu0fGXlTH1vtDC/TH sX0LNmhV4cm3KqqPhJiOlWQ2vX9QEAcT0Acj2HxK9jSirr2fj9E3KxUviPgPYaD7MXlH3H Rot7j6TD6ookY2sI3UbtVrAQ5JiIiG4= X-MC-Unique: fCwizl3rO9ikcdOf7GWCyQ-1 X-Mimecast-MFC-AGG-ID: fCwizl3rO9ikcdOf7GWCyQ_1743062797 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 4/6] target/s390x: Fix a typo in s390_cpu_class_init() Date: Thu, 27 Mar 2025 09:06:20 +0100 Message-ID: <20250327080622.954388-5-thuth@redhat.com> In-Reply-To: <20250327080622.954388-1-thuth@redhat.com> References: <20250327080622.954388-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1743062874539019000 From: Philippe Mathieu-Daud=C3=A9 Replace the comma at the end of the line by a semicolon. Fixes: 41868f846d2 ("s390x/cpumodel: "host" and "qemu" as CPU subclasses") Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250324165356.39540-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- target/s390x/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index d73142600bf..1f75629ddc2 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -377,7 +377,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) resettable_class_set_parent_phases(rc, NULL, s390_cpu_reset_hold, NULL, &scc->parent_phases); =20 - cc->class_by_name =3D s390_cpu_class_by_name, + cc->class_by_name =3D s390_cpu_class_by_name; cc->mmu_index =3D s390x_cpu_mmu_index; cc->dump_state =3D s390_cpu_dump_state; cc->query_cpu_fast =3D s390_query_cpu_fast; --=20 2.49.0 From nobody Wed Apr 2 13:16:58 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1743062841; cv=none; d=zohomail.com; s=zohoarc; b=kth2KIzUIgyN109S8Cvcc0Fr8H3FVJOov9BSQ0/60iVMG2leyZDaVCrXwonrMP5IT08odWtExKvNgejwjawjPJo8wWKQZPXFZF/1NV4AdpWBQORoQZjHIP5QrX8lGzFntwGp/nk/1GclHfRZIylPUqhtTu3qapQomrcJXuq8OB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743062841; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VMBpKp04CIINiZQusrQvsEbysXUo3UnkwiHZM16eSXs=; b=WfhEF2T8VMuVWTw9hY6VHOIc/B+PUzXspYCXzHc77LfE1k6dW5OCbBI8LpP/LmOID0/N2p8ILNiP67dHbELTb8u12GJ5bccwFTUNBS1QpG0IeMVeUWwN6DdKCSdaROOBqK5B1SbeTNkDLyZnOKrgrDC+nd5rL3+ha9bdAzDJxW8= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1743062840984128.97039414521544; Thu, 27 Mar 2025 01:07:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiGW-0000ku-3M; Thu, 27 Mar 2025 04:07:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGT-0000am-LF for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:07:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGS-00065n-1u for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:07:01 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-viO8-p2bOw6sRGziXESZ-w-1; Thu, 27 Mar 2025 04:06:40 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9844A18007E1; Thu, 27 Mar 2025 08:06:39 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.126]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2734819560AB; Thu, 27 Mar 2025 08:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743062819; 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=VMBpKp04CIINiZQusrQvsEbysXUo3UnkwiHZM16eSXs=; b=a2gmKTprnqSUzHdZknyxMfnJg0jA16q6dNEUmaCbadtQ+fr6C6Tq0gwdOgaVJAcvIJ+e7U 3qC4ElVsC0RLdscx5Sz+UXs9rzL+G+lBcn4KoTN50hEkIxycMRFuiDBaTFfwBhxHiNcPpC 8KGzQ1pFtkozyUlIUf48j2/vcgqP/qY= X-MC-Unique: viO8-p2bOw6sRGziXESZ-w-1 X-Mimecast-MFC-AGG-ID: viO8-p2bOw6sRGziXESZ-w_1743062799 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 5/6] tests/functional/test_aarch64_virt_gpu: Skip if "dbus" display isn't available Date: Thu, 27 Mar 2025 09:06:21 +0100 Message-ID: <20250327080622.954388-6-thuth@redhat.com> In-Reply-To: <20250327080622.954388-1-thuth@redhat.com> References: <20250327080622.954388-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1743062842765019000 From: Thomas Huth This test currently fails if the "dbus" display has not been compiled into the binary (which can happen when CFI has been enabled, for example). Check for the error message to skip the test in that case. While we're at it, also make sure that this test is covered in the right section in the MAINTAINERS file. Message-ID: <20250325061609.272847-1-thuth@redhat.com> Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- tests/functional/test_aarch64_virt_gpu.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8f470a1c9b7..c1ccb0acd14 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1018,7 +1018,7 @@ S: Maintained F: hw/arm/virt* F: include/hw/arm/virt.h F: docs/system/arm/virt.rst -F: tests/functional/test_aarch64_virt.py +F: tests/functional/test_aarch64_virt*.py F: tests/functional/test_aarch64_tuxrun.py F: tests/functional/test_arm_tuxrun.py =20 diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/t= est_aarch64_virt_gpu.py index 314d994a7aa..38447278579 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -74,6 +74,8 @@ def _launch_virt_gpu(self, gpu_device): self.skipTest("Can't access host DRM render node") elif "'type' does not accept value 'egl-headless'" in excp.out= put: self.skipTest("egl-headless support is not available") + elif "'type' does not accept value 'dbus'" in excp.output: + self.skipTest("dbus display support is not available") else: self.log.info("unhandled launch failure: %s", excp.output) raise excp --=20 2.49.0 From nobody Wed Apr 2 13:16:58 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1743062872; cv=none; d=zohomail.com; s=zohoarc; b=IhoMvIR0jC8h3awys5XmMW0NrIWEDoKklH1enkiVdicIGT15Antfe5GPwqNO2Dz47tUUGRFEzZ9+gsDWFNVRUtoxtVUk2yfPwZtLYqjvQL/2c6SnrPw5hIWGQDrTirRj7sl4S7VHzq5zqjlM18FjWqfLTVllpk37vBrF0pTnUPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743062872; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HcF9btIJ40JVRmNnmzpLg0Y1eP9hb/M0NGRSrm//eHo=; b=KNYDzn+18AuTyIn4f8wK3yyGz3ddoBS0I3Deft1ibqOkSEhi10orBdwqG4B6/Syel/JYsZYAuSpmkKBKaFwybovC8WRh3L4vD6A5BfzIpjdBNlRLRt1LpnKLq8fYQm1xXuhyaAe/K//1JWJl96NJjJP05P+IXKVMPJvq63IOa14= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1743062872091512.4931274396187; Thu, 27 Mar 2025 01:07:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiGR-0000Vn-7B; Thu, 27 Mar 2025 04:06:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGG-0000RS-4J for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txiGE-00063y-GA for qemu-devel@nongnu.org; Thu, 27 Mar 2025 04:06:47 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-523-EifAxaOKMaGwTw8vBQLVSQ-1; Thu, 27 Mar 2025 04:06:42 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CBB791809CA3 for ; Thu, 27 Mar 2025 08:06:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.126]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1DC6719560AB; Thu, 27 Mar 2025 08:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743062804; 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=HcF9btIJ40JVRmNnmzpLg0Y1eP9hb/M0NGRSrm//eHo=; b=Lw7C/ESoAsAHDuC0DqmSLS0z06n3dh4kSBFTyZjjIFMnIMQ+cczkCG5I8vE9YanI9NVpc8 Nz5QO6xCWhFkuOib0NdZJ3g1bmnaad8p56yfDZYJgnbP0P1Zq0j3ejDOz9yJH6sYl7lrY4 No4JGHKT/cOUPErMvu70vwKyTewvOic= X-MC-Unique: EifAxaOKMaGwTw8vBQLVSQ-1 X-Mimecast-MFC-AGG-ID: EifAxaOKMaGwTw8vBQLVSQ_1743062801 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 6/6] tests/functional/test_vnc: Skip test if VNC support is not available Date: Thu, 27 Mar 2025 09:06:22 +0100 Message-ID: <20250327080622.954388-7-thuth@redhat.com> In-Reply-To: <20250327080622.954388-1-thuth@redhat.com> References: <20250327080622.954388-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1743062872601019000 From: Thomas Huth These tests currently fail if VNC support has not been compiled into the QEMU binary. Let's add some checks to skip the tests in that case instead. Message-ID: <20250325064715.278876-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- tests/functional/test_vnc.py | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/tests/functional/test_vnc.py b/tests/functional/test_vnc.py index 1916be0103f..8c9953bdb00 100755 --- a/tests/functional/test_vnc.py +++ b/tests/functional/test_vnc.py @@ -12,6 +12,7 @@ =20 import socket from typing import List +from qemu.machine.machine import VMLaunchFailure =20 from qemu_test import QemuSystemTest from qemu_test.ports import Ports @@ -32,7 +33,14 @@ class Vnc(QemuSystemTest): def test_no_vnc_change_password(self): self.vm.add_args('-nodefaults', '-S') self.vm.launch() - self.assertFalse(self.vm.qmp('query-vnc')['return']['enabled']) + + query_vnc_response =3D self.vm.qmp('query-vnc') + if 'error' in query_vnc_response: + self.assertEqual(query_vnc_response['error']['class'], + 'CommandNotFound') + self.skipTest('VNC support not available') + self.assertFalse(query_vnc_response['return']['enabled']) + set_password_response =3D self.vm.qmp('change-vnc-password', password=3D'new_password') self.assertIn('error', set_password_response) @@ -41,9 +49,19 @@ def test_no_vnc_change_password(self): self.assertEqual(set_password_response['error']['desc'], 'Could not set password') =20 + def launch_guarded(self): + try: + self.vm.launch() + except VMLaunchFailure as excp: + if "-vnc: invalid option" in excp.output: + self.skipTest("VNC support not available") + else: + self.log.info("unhandled launch failure: %s", excp.output) + raise excp + def test_change_password_requires_a_password(self): self.vm.add_args('-nodefaults', '-S', '-vnc', ':1,to=3D999') - self.vm.launch() + self.launch_guarded() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) set_password_response =3D self.vm.qmp('change-vnc-password', password=3D'new_password') @@ -55,7 +73,7 @@ def test_change_password_requires_a_password(self): =20 def test_change_password(self): self.vm.add_args('-nodefaults', '-S', '-vnc', ':1,to=3D999,passwor= d=3Don') - self.vm.launch() + self.launch_guarded() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) self.vm.cmd('change-vnc-password', password=3D'new_password') @@ -66,7 +84,7 @@ def do_test_change_listen(self, a, b, c): self.assertFalse(check_connect(c)) =20 self.vm.add_args('-nodefaults', '-S', '-vnc', f'{VNC_ADDR}:{a - 59= 00}') - self.vm.launch() + self.launch_guarded() self.assertEqual(self.vm.qmp('query-vnc')['return']['service'], st= r(a)) self.assertTrue(check_connect(a)) self.assertFalse(check_connect(b)) --=20 2.49.0