From nobody Tue May 13 11:49:27 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673535363; cv=none; d=zohomail.com; s=zohoarc; b=NqVCAOcdgeY7gAqCSbONPH9IB22BZqBPI/r9MUoqmTYF4UtRfB+CPzhFSPYwEfzWUdDTEZFF6mMO4bMoK12Sr2cgwNzyQ72Upz3VD+PGK0H8ieiaFz36KkVPtEyZGMTtUnR5alKxQHfRsKv3GP4bX6pPaZW4owED+5uP84dQmLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673535363; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AJXz815BdS7g+uY8lVjYJEOlxy0y1KtY4t37lPrhGQ8=; b=PtWsoSFsf5WNIiYjj5jb0EaXEmUHI1K3nZ0rB4ASHRSjSzuxwfZbVnMCnu0CAJmhXpElMVEoB2HfhGvFQ7XrXsytWuajVJQpfm7BsdAnDYijyt9bAEZfUbW23XJC0QmeZbalQ0S0utzbMeKs4B7oMxQY7VpeQYlxqNFLPCdowcU= 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+importer2=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 SMTP id 1673535363764147.05938212350407; Thu, 12 Jan 2023 06:56:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFyBR-0002Nl-El; Thu, 12 Jan 2023 09:03:57 -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 1pFyB9-000277-Nh for qemu-devel@nongnu.org; Thu, 12 Jan 2023 09:03:42 -0500 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 1pFyB2-0005sV-Uu for qemu-devel@nongnu.org; Thu, 12 Jan 2023 09:03:37 -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-41-WjWj2iiXNqG-n55tOFHr-w-1; Thu, 12 Jan 2023 09:03:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 112AA3C38FF2; Thu, 12 Jan 2023 14:03:18 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq2.redhat.com (dell-r430-03.lab.eng.brq2.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 803624085723; Thu, 12 Jan 2023 14:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673532201; 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=AJXz815BdS7g+uY8lVjYJEOlxy0y1KtY4t37lPrhGQ8=; b=Ate9Q+/EWtVPz9ZQ2qDhGz93CrsYQ6nEekM2LMVgd998AKvFMAGrhnndhQuDXvEAnVVQPc /ZWHh9Q3amkSjZm1DiWzlB1qUzR6D6kwKdMPxlf89DMwpBgoGt5ikGMwUMPlNlQNwcmbb/ h5NuKHRLrwrQA1DXx1UuhGe4Zwbu1Gc= X-MC-Unique: WjWj2iiXNqG-n55tOFHr-w-1 From: Igor Mammedov To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Ani Sinha Subject: [PATCH 04/40] tests: acpi: extend pcihp with nested bridges Date: Thu, 12 Jan 2023 15:02:36 +0100 Message-Id: <20230112140312.3096331-5-imammedo@redhat.com> In-Reply-To: <20230112140312.3096331-1-imammedo@redhat.com> References: <20230112140312.3096331-1-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=imammedo@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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673535364516100001 add nested bridges/root-ports to pcihp tests, to make sure follow up patches don't break nested enumeration of bridges in DSDT. Signed-off-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 08b8aee76b..6a99b10384 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -863,7 +863,8 @@ static void test_acpi_piix4_tcg_bridge(void) data.variant =3D ".bridge"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); - test_acpi_one("-device pci-bridge,chassis_nr=3D1", &data); + test_acpi_one("-device pci-bridge,chassis_nr=3D1 " + "-device pci-bridge,bus=3Dpci.1,addr=3D1.0,chassis_nr=3D= 2 ", &data); free_test_data(&data); } =20 @@ -877,7 +878,8 @@ static void test_acpi_piix4_no_root_hotplug(void) data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); test_acpi_one("-global PIIX4_PM.acpi-root-pci-hotplug=3Doff " - "-device pci-bridge,chassis_nr=3D1", &data); + "-device pci-bridge,chassis_nr=3D1 " + "-device pci-bridge,bus=3Dpci.1,addr=3D1.0,chassis_nr=3D= 2 ", &data); free_test_data(&data); } =20 @@ -891,7 +893,8 @@ static void test_acpi_piix4_no_bridge_hotplug(void) data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); test_acpi_one("-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support= =3Doff " - "-device pci-bridge,chassis_nr=3D1", &data); + "-device pci-bridge,chassis_nr=3D1 " + "-device pci-bridge,bus=3Dpci.1,addr=3D1.0,chassis_nr=3D= 2 ", &data); free_test_data(&data); } =20 @@ -965,8 +968,14 @@ static void test_acpi_q35_multif_bridge(void) " -device virtio-balloon,id=3Dballoon0,addr=3D0x4.0x2" " -device pcie-root-port,id=3Drp0,multifunction=3Don," "port=3D0x0,chassis=3D1,addr=3D0x2" - " -device pcie-root-port,id=3Drp1,port=3D0x1,chassis=3D2,addr=3D0x= 3.0x1", + " -device pcie-root-port,id=3Drp1,port=3D0x1,chassis=3D2,addr=3D0x= 3.0x1" + " -device pcie-root-port,id=3Drp2,port=3D0x0,chassis=3D3,bus=3Drp1= ,addr=3D0.0" + " -device pci-bridge,bus=3Drp2,chassis_nr=3D4,id=3Dbr1" + " -device pcie-root-port,id=3Drphptgt1,port=3D0x0,chassis=3D5,addr= =3D2.1" + " -device pcie-root-port,id=3Drphptgt2,port=3D0x0,chassis=3D6,addr= =3D2.2" + " -device pcie-root-port,id=3Drphptgt3,port=3D0x0,chassis=3D7,addr= =3D2.3", &data); + free_test_data(&data); } =20 --=20 2.31.1