From nobody Mon Feb 9 03:29:22 2026 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=1676373860; cv=none; d=zohomail.com; s=zohoarc; b=Iz9LPG7icwrMN4Qitmjln0v3uXoBdGKGOmDfPdPKk9Tz/1P8neZkZzJXPTqtpnWaFg7LWpZEiLrz99mOGtdApPrCx3hzfaVr6TrUI9LsApm5dDS3GeSJFyV/pMwNaF8SQZVmzLlQUayiC2v/Q+mX2snr2AmJJnsStiiSK91ptmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676373860; 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=tXC5uUKH3sRKisV5CEfIbm8aKEjeO6mLbuG7HjDpjn0=; b=kmJ85+Ja7gkXTG0V1EwkihA0nmHRudKBG5HCfpLu2+HmKfeEQmTJahf11nFoFAX7drTyVq4vfKe35j1p2J8D+Ct6RLVD6NE2mEvcuxeTvCVWuQmyRKMDkqP0BorJ3T3ncT/zG4J9ppRTjAxn4rNJ465X/qSXJP3YO/3lerC+JuE= 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 1676373860919444.595366136341; Tue, 14 Feb 2023 03:24:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRtO4-0007FE-QH; Tue, 14 Feb 2023 06:22:16 -0500 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 1pRtO3-0007Ee-Fk for qemu-devel@nongnu.org; Tue, 14 Feb 2023 06:22:15 -0500 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 1pRtO1-0002LV-Ti for qemu-devel@nongnu.org; Tue, 14 Feb 2023 06:22:15 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-438-aIGRpst1PAe59qQTzmjebw-1; Tue, 14 Feb 2023 06:22:10 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D02EF1C06EC8; Tue, 14 Feb 2023 11:22:09 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id E541E40B40C9; Tue, 14 Feb 2023 11:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676373733; 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=tXC5uUKH3sRKisV5CEfIbm8aKEjeO6mLbuG7HjDpjn0=; b=NzvklE8bnYVQer60ViEFy81RTkmRSI340ten5KnPPEnNaTmiY0oUDnQ1pyElSOm2yt5Khh rrK4OaKNDKxCBtpzrUQOPcv3z8blTMaEzjTLd0RlmJ0ShdBrqBZvy6jPZBKMnbzxTS73DN I01XRRmFlpzcB5G66d1K8yxaoW2S06s= X-MC-Unique: aIGRpst1PAe59qQTzmjebw-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Fabiano Rosas Subject: [PULL 14/22] tests/qtest: Skip unplug tests that use missing devices Date: Tue, 14 Feb 2023 12:21:40 +0100 Message-Id: <20230214112148.646077-15-thuth@redhat.com> In-Reply-To: <20230214112148.646077-1-thuth@redhat.com> References: <20230214112148.646077-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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, 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: 1676373861867100005 Content-Type: text/plain; charset="utf-8" From: Fabiano Rosas Signed-off-by: Fabiano Rosas Message-Id: <20230208194700.11035-8-farosas@suse.de> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/device-plug-test.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c index 4f92617335..01cecd6e20 100644 --- a/tests/qtest/device-plug-test.c +++ b/tests/qtest/device-plug-test.c @@ -68,6 +68,11 @@ static void test_pci_unplug_request(void) const char *arch =3D qtest_get_arch(); const char *machine_addition =3D ""; =20 + if (!qtest_has_device("virtio-mouse-pci")) { + g_test_skip("Device virtio-mouse-pci not available"); + return; + } + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { machine_addition =3D "-machine pc"; } @@ -82,11 +87,17 @@ static void test_pci_unplug_request(void) =20 static void test_q35_pci_unplug_request(void) { + QTestState *qtest; + + if (!qtest_has_device("virtio-mouse-pci")) { + g_test_skip("Device virtio-mouse-pci not available"); + return; + } =20 - QTestState *qtest =3D qtest_initf("-machine q35 " - "-device pcie-root-port,id=3Dp1 " - "-device pcie-pci-bridge,bus=3Dp1,id= =3Db1 " - "-device virtio-mouse-pci,bus=3Db1,id= =3Ddev0"); + qtest =3D qtest_initf("-machine q35 " + "-device pcie-root-port,id=3Dp1 " + "-device pcie-pci-bridge,bus=3Dp1,id=3Db1 " + "-device virtio-mouse-pci,bus=3Db1,id=3Ddev0"); =20 process_device_remove(qtest, "dev0"); =20 @@ -99,6 +110,11 @@ static void test_pci_unplug_json_request(void) const char *arch =3D qtest_get_arch(); const char *machine_addition =3D ""; =20 + if (!qtest_has_device("virtio-mouse-pci")) { + g_test_skip("Device virtio-mouse-pci not available"); + return; + } + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { machine_addition =3D "-machine pc"; } @@ -114,6 +130,7 @@ static void test_pci_unplug_json_request(void) =20 static void test_q35_pci_unplug_json_request(void) { + QTestState *qtest; const char *port =3D "-device \"{'driver': 'pcie-root-port', " "'id': 'p1'}\""; =20 @@ -125,8 +142,12 @@ static void test_q35_pci_unplug_json_request(void) "'bus': 'b1', " "'id': 'dev0'}\""; =20 - QTestState *qtest =3D qtest_initf("-machine q35 %s %s %s", - port, bridge, device); + if (!qtest_has_device("virtio-mouse-pci")) { + g_test_skip("Device virtio-mouse-pci not available"); + return; + } + + qtest =3D qtest_initf("-machine q35 %s %s %s", port, bridge, device); =20 process_device_remove(qtest, "dev0"); =20 --=20 2.31.1