From nobody Sat May 4 04:44:47 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653234836369897.8959164493765; Sun, 22 May 2022 08:53:56 -0700 (PDT) Received: from localhost ([::1]:52830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsntz-0001ZK-8v for importer2@patchew.org; Sun, 22 May 2022 11:53:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqZ-0007Am-73 for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:23 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqW-0007wY-0z for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:22 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsnpU-0006zJ-KW; Sun, 22 May 2022 16:49:16 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Z1Rzz9Hn/sUPXSWGV/8RA4pIwXK9igEY7gMTM2wHsdM=; b=PO1wItf9g+JFFS3EL5XivfJ9D6 YkPVZrHUtdR9W2YCYDiosuO5v9iSOEvv41f5jGX8rCfebiZP111GwSRJZLQNuMD2odQsd1IEZJw7D mQP0n87Y+s4A5mbOdLrixG6BKWvgGBYDifGRKSiI94Vu09UPlujodztAfQElEDDlYB7NldYy7ZhOe PZ2fwQsiPtHoVP8TeYPmGBAGJxXm+Y1k8+KyNQ8hXgDCu6cWtsdMNAIiKcNWdq/fNlP4HG1PvBkCN z6RpQuOOb1mC3tR9o4RLSkeH1S7wKw6CrUlt4o+hT5i+tPhVqL4wsZqP0FBXwLvga6xBieLIc9Uwv l7nGjWb+yaUE4iZ9VeSXyajBQAoNl2ZhBpumD1J1dc07C4MIVjVknjYtn2Yw2zNx8BA9M69x8Dupj ztOutfu0jjBbdC3Jzg418y5+tju5Twumr75tQ82XWByqQw630sU1gtPMwSsaA4h4woKm6SkXzoTxV a5YkEsB9r41E8ChpQbSMg6qp9HmxQkcUn2yPke4hLPcXLOEaEGoEYz+iK+FwLDqi44NRG4n5MQNtt 4fhIEED7IXP3Zms4Q0EEBULps4F42VLPOyWOd/Plp09IMdpy9Or9tU6dDT2vMvjQJSxRIY9BZKBsR Kkqs2wS+BXIrPpi7JSyZzp2TFmIz+q8wl5Y8raWzA=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Sun, 22 May 2022 16:50:03 +0100 Message-Id: <20220522155008.21832-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> References: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 1/6] hw/acpi/viot: rename build_pci_range_node() to enumerate_pci_host_bridges() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653234838579100001 Content-Type: text/plain; charset="utf-8" This is in preparation for separating out the VIOT ACPI table build from the PCI host bridge numeration. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha --- hw/acpi/viot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index c1af75206e..a41daded71 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -17,7 +17,7 @@ struct viot_pci_ranges { }; =20 /* Build PCI range for a given PCI host bridge */ -static int build_pci_range_node(Object *obj, void *opaque) +static int enumerate_pci_host_bridges(Object *obj, void *opaque) { struct viot_pci_ranges *pci_ranges =3D opaque; GArray *blob =3D pci_ranges->blob; @@ -78,7 +78,7 @@ void build_viot(MachineState *ms, GArray *table_data, BIO= SLinker *linker, }; =20 /* Build the list of PCI ranges that this viommu manages */ - object_child_foreach_recursive(OBJECT(ms), build_pci_range_node, + object_child_foreach_recursive(OBJECT(ms), enumerate_pci_host_bridges, &pci_ranges); =20 /* ACPI table header */ --=20 2.20.1 From nobody Sat May 4 04:44:47 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653234838865181.143801494046; Sun, 22 May 2022 08:53:58 -0700 (PDT) Received: from localhost ([::1]:53016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsnu1-0001hS-RT for importer2@patchew.org; Sun, 22 May 2022 11:53:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqb-0007BS-OO for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:25 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqZ-0007yt-NK for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:25 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsnpV-0006zJ-2W; Sun, 22 May 2022 16:49:21 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=CXd/zN/IKcBEtoTpKcM2kW0cXnnHtzwvxyKth+q7Un4=; b=HtTfFJo7kgOnv8ljotfPrhUsLo fWXs0K+ZzRdlf+Sbu3Yltx466NPfKhmJTWMYZLG6opRnmdQXZWbJYsk9V92G7JQF0ahraRS/5ObKz WyKYYpeSzr97ZVyFq9tXm2GNY14kC4TEbfRb8LEn4upkU1/6Ljo2et/g/suG4bOOHV1AkJqNOFtmI fLd+QhETM6As8iT6FlJE+ZFSkbndOcxt4nHGoDo7oVRZAq41qUCs1A8Iewjs+ABH5dfKRfXidZiTP NBVUmGwOJL0XYZEEgjue6f68yr1iTQ/onBf9AeZm4S4SjG8n262z3+WiXHB8DQ5CVSLdZjNvxTAac EjnEXSw4E6ABsSF9X7FVnmgZUyWXnan3Cvl+PHD4lKb443C4C7mkvkPL+1n4aMQIH7BDEH5je2Bkq 9riYnSVLSbnhSKx/pNdWkfHQGi7DIorL0toGVx/QmDTP6YoLCsUB6ZLwEqAL393RLta6J+JsKOnvU XROfPoEJTDTReNOSpHR/PAvQ051sjHcrORvlZxFun0TTvzMslhSrt2smiQ8/9uwSs1OGHmWwTvYrI X/qEshqEsOr64OzgTvpFAw8RAVZWNMxloQTwGBR/A5Ow/tCTNOuDGTLwhGRa6Md6gx/RQOucl4zlm Sxl8b6o908H9QieOxA39NJrwFIh7PU57Z9r/H3GHA=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Sun, 22 May 2022 16:50:04 +0100 Message-Id: <20220522155008.21832-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> References: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 2/6] hw/acpi/viot: move the individual PCI host bridge entry generation to a new function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653234840507100007 Content-Type: text/plain; charset="utf-8" Instead of generating each table entry inline, move the individual PCI host= bridge table entry generation to a separate build_pci_host_range() function. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha --- hw/acpi/viot.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index a41daded71..5dafcbf5ef 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -16,6 +16,31 @@ struct viot_pci_ranges { uint16_t output_node; }; =20 +static void build_pci_host_range(GArray *table_data, int min_bus, int max_= bus, + uint16_t output_node) +{ + /* Type */ + build_append_int_noprefix(table_data, 1 /* PCI range */, 1); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 1); + /* Length */ + build_append_int_noprefix(table_data, 24, 2); + /* Endpoint start */ + build_append_int_noprefix(table_data, PCI_BUILD_BDF(min_bus, 0), 4); + /* PCI Segment start */ + build_append_int_noprefix(table_data, 0, 2); + /* PCI Segment end */ + build_append_int_noprefix(table_data, 0, 2); + /* PCI BDF start */ + build_append_int_noprefix(table_data, PCI_BUILD_BDF(min_bus, 0), 2); + /* PCI BDF end */ + build_append_int_noprefix(table_data, PCI_BUILD_BDF(max_bus, 0xff), 2); + /* Output node */ + build_append_int_noprefix(table_data, output_node, 2); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 6); +} + /* Build PCI range for a given PCI host bridge */ static int enumerate_pci_host_bridges(Object *obj, void *opaque) { @@ -30,27 +55,8 @@ static int enumerate_pci_host_bridges(Object *obj, void = *opaque) =20 pci_bus_range(bus, &min_bus, &max_bus); =20 - /* Type */ - build_append_int_noprefix(blob, 1 /* PCI range */, 1); - /* Reserved */ - build_append_int_noprefix(blob, 0, 1); - /* Length */ - build_append_int_noprefix(blob, 24, 2); - /* Endpoint start */ - build_append_int_noprefix(blob, PCI_BUILD_BDF(min_bus, 0), 4); - /* PCI Segment start */ - build_append_int_noprefix(blob, 0, 2); - /* PCI Segment end */ - build_append_int_noprefix(blob, 0, 2); - /* PCI BDF start */ - build_append_int_noprefix(blob, PCI_BUILD_BDF(min_bus, 0), 2); - /* PCI BDF end */ - build_append_int_noprefix(blob, PCI_BUILD_BDF(max_bus, 0xff), = 2); - /* Output node */ - build_append_int_noprefix(blob, pci_ranges->output_node, 2); - /* Reserved */ - build_append_int_noprefix(blob, 0, 6); - + build_pci_host_range(blob, min_bus, max_bus, + pci_ranges->output_node); pci_ranges->count++; } } --=20 2.20.1 From nobody Sat May 4 04:44:47 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653234837588242.68102447109175; Sun, 22 May 2022 08:53:57 -0700 (PDT) Received: from localhost ([::1]:52966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsnu0-0001eW-KI for importer2@patchew.org; Sun, 22 May 2022 11:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqe-0007Ct-MU for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:28 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqd-00080Z-1f for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:28 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsnpZ-0006zJ-9e; Sun, 22 May 2022 16:49:25 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Bc/VAudqIr1GwivhlLt77+4T8Jdd4YY2naMJX3sS0Hk=; b=Jy9nv0gXuEAxsvH5OBoloZRc9R CdzgvVTAumYja6K7Nosp1YZxOWYWQCnNmcLqT2+82dGjT5/4XoMP2fR8sGq1J6/NSpVogZ+8QWDW9 aubGsPsFq0dmofaSXuHdnrUNecCXV50K8yeB0wmI5RZ2nOy1OSKvBYeZdaNsOQUU/NbTM5Rp/ZVLv tsnWTRo1Fc8105BV5pIzPeqwuMKlc5xmR2cd6kWDSuMsEgUdLtYok6SRXZroAoHNrxIQ4Fnw7O6+4 2hCDKAR1j+8LBNMouyBZQWCoPyE0LkNAbAqnciJfq/m4yGwIzhly4BhIWP1zpnUpussTgAGkWO3yB vwyLJY0ZmwOECo+89VDKxbUKUin7N5aVLFoOzDIzTgLFE3Dhnzz6M+F9UrsQ87QgV590SyuNADk+0 A+wS0Xap/XXpjQLJqy4OFwTQqlw+aUhz5rQoP4lGikFh1Q1TpDrwKiLPtmzAkM3JUs0lxPTxtTAhe 4iaorNUMd00brBR9Osgb0Llq4MaGlbS4H88cV+RFsb9NkPxkACCl2HGpTe8C1kdJeZSpEcJaYvsNH yT6uLrExS9uqM+NzEJete6igAfJSuFakf5x06FMfzWYIVijipp36a3TFpXoOmkQh9iy3SPh0S0N6v PcaYeeb3LZTvcQK6+sSAJNv7GjqowOtRVHg8qm9zs=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Sun, 22 May 2022 16:50:05 +0100 Message-Id: <20220522155008.21832-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> References: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 3/6] hw/acpi/viot: build array of PCI host bridges before generating VIOT ACPI table X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653234838599100002 Content-Type: text/plain; charset="utf-8" Perform the generation of the VIOT ACPI table in 2 separate passes: the fir= st pass enumerates all of the PCI host bridges and adds the min_bus and max_bus inf= ormation to an array. Once this is done the VIOT table header is generated using the size of the = array to calculate the node count, which means it is no longer necessary to use a sub-array to hold the PCI host bridge range information along with viommu_o= ff. Finally the PCI host bridge array is iterated again to add the required ent= ries to the final VIOT ACPI table. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha --- hw/acpi/viot.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index 5dafcbf5ef..6ca041d18e 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -10,10 +10,9 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" =20 -struct viot_pci_ranges { - GArray *blob; - size_t count; - uint16_t output_node; +struct viot_pci_host_range { + int min_bus; + int max_bus; }; =20 static void build_pci_host_range(GArray *table_data, int min_bus, int max_= bus, @@ -44,8 +43,7 @@ static void build_pci_host_range(GArray *table_data, int = min_bus, int max_bus, /* Build PCI range for a given PCI host bridge */ static int enumerate_pci_host_bridges(Object *obj, void *opaque) { - struct viot_pci_ranges *pci_ranges =3D opaque; - GArray *blob =3D pci_ranges->blob; + GArray *pci_host_ranges =3D opaque; =20 if (object_dynamic_cast(obj, TYPE_PCI_HOST_BRIDGE)) { PCIBus *bus =3D PCI_HOST_BRIDGE(obj)->bus; @@ -55,9 +53,11 @@ static int enumerate_pci_host_bridges(Object *obj, void = *opaque) =20 pci_bus_range(bus, &min_bus, &max_bus); =20 - build_pci_host_range(blob, min_bus, max_bus, - pci_ranges->output_node); - pci_ranges->count++; + struct viot_pci_host_range pci_host_range =3D { + .min_bus =3D min_bus, + .max_bus =3D max_bus, + }; + g_array_append_val(pci_host_ranges, pci_host_range); } } =20 @@ -78,19 +78,19 @@ void build_viot(MachineState *ms, GArray *table_data, B= IOSLinker *linker, int viommu_off =3D 48; AcpiTable table =3D { .sig =3D "VIOT", .rev =3D 0, .oem_id =3D oem_id, .oem_table_id =3D oem_table_id= }; - struct viot_pci_ranges pci_ranges =3D { - .output_node =3D viommu_off, - .blob =3D g_array_new(false, true /* clear */, 1), - }; + GArray *pci_host_ranges =3D g_array_new(false, true, + sizeof(struct viot_pci_host_ran= ge)); + struct viot_pci_host_range *pci_host_range; + int i; =20 /* Build the list of PCI ranges that this viommu manages */ object_child_foreach_recursive(OBJECT(ms), enumerate_pci_host_bridges, - &pci_ranges); + pci_host_ranges); =20 /* ACPI table header */ acpi_table_begin(&table, table_data); /* Node count */ - build_append_int_noprefix(table_data, pci_ranges.count + 1, 2); + build_append_int_noprefix(table_data, pci_host_ranges->len + 1, 2); /* Node offset */ build_append_int_noprefix(table_data, viommu_off, 2); /* Reserved */ @@ -111,9 +111,15 @@ void build_viot(MachineState *ms, GArray *table_data, = BIOSLinker *linker, build_append_int_noprefix(table_data, 0, 8); =20 /* PCI ranges found above */ - g_array_append_vals(table_data, pci_ranges.blob->data, - pci_ranges.blob->len); - g_array_free(pci_ranges.blob, true); + for (i =3D 0; i < pci_host_ranges->len; i++) { + pci_host_range =3D &g_array_index(pci_host_ranges, + struct viot_pci_host_range, i); + + build_pci_host_range(table_data, pci_host_range->min_bus, + pci_host_range->max_bus, viommu_off); + } + + g_array_free(pci_host_ranges, true); =20 acpi_table_end(linker, &table); } --=20 2.20.1 From nobody Sat May 4 04:44:47 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653235030359292.76238781633594; Sun, 22 May 2022 08:57:10 -0700 (PDT) Received: from localhost ([::1]:33376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsnx7-0008J8-BH for importer2@patchew.org; Sun, 22 May 2022 11:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqi-0007EK-LV for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:32 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqh-00084I-8G for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:32 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsnpd-0006zJ-4m; Sun, 22 May 2022 16:49:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=XilbPG9QOPj9XejKsWc7M3oiDwtb+9UTHECd9ZERYaI=; b=rFsCODy07ddNbiLB3BvAkSp5ZX DKkDuWj1qhSpJmvQC8XThGJ5lG7HD5a2AKoayACiqBblNozR1AE6mzXX95L6xlcMH5H0uiZrg8ptN GkEGI0puNG1lG3gwX1UmIJVXK3vjAzUpDUTfr99Xpw3kZR4PEmpfgirblMJezn8RAPDJzIKq2Her+ mjr00/Z3Ge6hBY61sXA0Dy5QUTjF1S4J7x6p7CImtx3EC4bxFDqJMwXWCQpeEZ3yiNlvcuzznzTu7 vYQkKHm2ALc4BffA8EKjvaxI9XHzzktrRg7RtQ+SV7Bece4ikbVFBfqGt8EXldgOCeTi7n9lIqMPT 2HnmziJjCkAXcipIqQihdHpIGeXAZjt+OFtnPZUH4j7G3I7Fv4XkJ/oyW8+CZVL29SzXynHT2yLdh Wpo/ART3/go9/MeC/py9wieHt1otLaQqvY4XQdvRGzNfI0qDKHukoY37is7FHmEPE7mwta8b81VJK NQnSkaXAYMtktXsCm4IatbRrkyv7kaxOx7yTuwYZJSXfzNdPgtDtJpkO1xGsGrXB3CfAdwxiuKqLL 1l1LAB2ZIVqo8xhdXJF4AJ3Dp4TD33ZetJPuOYoNPbIitiY3LAzzT+1fGDsJM0MxsJSoOg9Cipu+J Hj7l9ZM9N80LGOjh8xdQPd6koRNO5kke72BPqhyjo=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Sun, 22 May 2022 16:50:06 +0100 Message-Id: <20220522155008.21832-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> References: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 4/6] tests/acpi: virt: allow VIOT acpi table changes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653235031333100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Acked-by: Ani Sinha --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..8367ffe1d4 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/VIOT", --=20 2.20.1 From nobody Sat May 4 04:44:47 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653235024534609.2682634714255; Sun, 22 May 2022 08:57:04 -0700 (PDT) Received: from localhost ([::1]:33264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsnx1-0008Er-3d for importer2@patchew.org; Sun, 22 May 2022 11:57:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqm-0007J1-O2 for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:36 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnql-00084j-8e for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:36 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsnph-0006zJ-BR; Sun, 22 May 2022 16:49:33 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=R6D8Ayin6wAdGj7XiIWsL9Jb38aKCyQebycCOGDxBLw=; b=L1P0IeMzBExjQ6bSZIUr+cOcNW Z2mDyVUHdZrcXHRyLPzJDV12Alae6njrmG+hRG4nxflV8rzDSyicWMDq08c4NCPeFnGwsteCqRJq/ iGrMZph0/eBFIVayjfx7CqxheR7NeAzXq82oPSf5uaX+/bJXdZIrY4yMaeE7fzKxgkL4dv0c/+Wof 33EoLoWhO/kax31txXZsZsu1CUQqNtES9vR/TAztbHC1V+RdlT7t5sQKfvb/oXZvOxQ2f+Qnw71BG yNkqILSOgKFXuqWhFp+xGec98hZkvz91aH74YztdI3CCLyu2E45PBnsBBwshvH4ruBbgWrBfVCYOF drfmJvm4ZPazNjThueWhOMplANRASqRPkdN3dsLD83OLBFNijlgrknyHE+K2GwMiIhreaG0SNuGjy T9EWoLDn1+lxl+YgVNZYmgyK5T64yEHZGnn9Wlda4zz97AVAhxX2O517wZ0aKeNJAPcIpEwrUv6gV EnRVL3QFXWMw+5eiK36/IzZ/5TKZMqTIHjXDYphjoNmRREhonrrWeCVS7ZrdzKTyKVQQFYtq9x6Sa ZcpUrSlXcNR4Qa6b7MGRvOachSlys1mtJXRuJlLPh/IRcrO/T2AwvcJYvFRgrvhmgLpKBUn4ynE7n aObaoOQB4Cfs5vU8EHRqHUkaIQAaGe/0yXb8cMKZw=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Sun, 22 May 2022 16:50:07 +0100 Message-Id: <20220522155008.21832-6-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> References: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 5/6] hw/acpi/viot: sort VIOT ACPI table entries by PCI host bridge min_bus X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653235025317100001 Content-Type: text/plain; charset="utf-8" This ensures that the VIOT ACPI table output is always stable for a given P= CI topology by ensuring that entries are ordered according to min_bus. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha --- hw/acpi/viot.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index 6ca041d18e..ff46703d87 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -64,6 +64,20 @@ static int enumerate_pci_host_bridges(Object *obj, void = *opaque) return 0; } =20 +static gint pci_host_range_compare(gconstpointer a, gconstpointer b) +{ + struct viot_pci_host_range *range_a =3D (struct viot_pci_host_range *)= a; + struct viot_pci_host_range *range_b =3D (struct viot_pci_host_range *)= b; + + if (range_a->min_bus < range_b->min_bus) { + return -1; + } else if (range_a->min_bus > range_b->min_bus) { + return 1; + } else { + return 0; + } +} + /* * Generate a VIOT table with one PCI-based virtio-iommu that manages PCI * endpoints. @@ -87,6 +101,9 @@ void build_viot(MachineState *ms, GArray *table_data, BI= OSLinker *linker, object_child_foreach_recursive(OBJECT(ms), enumerate_pci_host_bridges, pci_host_ranges); =20 + /* Sort the pci host ranges by min_bus */ + g_array_sort(pci_host_ranges, pci_host_range_compare); + /* ACPI table header */ acpi_table_begin(&table, table_data); /* Node count */ --=20 2.20.1 From nobody Sat May 4 04:44:47 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16532350302231009.9074579273008; Sun, 22 May 2022 08:57:10 -0700 (PDT) Received: from localhost ([::1]:33406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsnx6-0008K8-NZ for importer2@patchew.org; Sun, 22 May 2022 11:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnr2-0007YE-7Q for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:52 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsnqm-00084t-RN for qemu-devel@nongnu.org; Sun, 22 May 2022 11:50:51 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsnpl-0006zJ-If; Sun, 22 May 2022 16:49:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=2a3LRylgA7FYve6ISDmrBg6axZPyUqTSB0+MhmI3M1E=; b=TkVn3jNco3fFJxBXAq6PeP4nTR eplC9ZOyusXTJU0IryLWsNn1UEOyRn1l8wAwiM6CH/Yd2zhQhBBmm1ms2tl8DhQZ+n1BDzLkHjRyI xz5OuHf6uADPIE7T97/SiLNRtM7+8BcBxtPysLrRftnd4HoJTs3OEYda9UBJrkSojqHwRgm6UyJiG twXmIhNYYV2T5AI8turkTYjrX0MDZk23Oyx898q4TfxxQpkec1xaR1i+E4GqcWcWkCbwADk8rCIL5 lLrfjxiq+7+siP7cDEpiVqKZAeHrEn7zIlZX44/UZQIqgyKfLU5yc+iaFdtI4doQl/dVpION7np2b lOMDgsFt+AbYmppizOEHW4TA4QZh0eNDcUlI70oMKf80cLMU1jNmLI32M7IuRR9C2N0T+APdnbz0f yLootzQvQpCkAALJssVzl/49s5gkvtWvz1wJhlR4HN6Tvx35/EOKYOOjNMMbzfMaN4fmXsUb07v7r jGNolwXG/etJeQHBx3YxFuynrsdZ1OjHSroBEb7wu4Iljj8yJzueVFpvY58tDWMPXaw+YvcXaQ0v8 EwRtsi84AGugziFLDc1RNdvlf03JDOn9fENB0m/p6h9otlFIu4zN52sbS3bxYCIVFpdlyD+tRPezK Wd/hCTpUxdzy+2vNQHAiwA487z554RsdgXi/QujJE=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Sun, 22 May 2022 16:50:08 +0100 Message-Id: <20220522155008.21832-7-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> References: <20220522155008.21832-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 6/6] tests/acpi: virt: update golden masters for VIOT X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653235031346100002 Content-Type: text/plain; charset="utf-8" Differences between disassembled ASL files for VIOT: +++ /tmp/asl-V69GM1.dsl 2022-05-18 10:22:27.239796759 +0100 @@ -36,11 +36,11 @@ [041h 0065 1] Reserved : 00 [042h 0066 2] Length : 0018 -[044h 0068 4] Endpoint start : 00003000 +[044h 0068 4] Endpoint start : 00001000 [048h 0072 2] PCI Segment start : 0000 [04Ah 0074 2] PCI Segment end : 0000 -[04Ch 0076 2] PCI BDF start : 3000 -[04Eh 0078 2] PCI BDF end : 30FF +[04Ch 0076 2] PCI BDF start : 1000 +[04Eh 0078 2] PCI BDF end : 10FF [050h 0080 2] Output node : 0030 [052h 0082 6] Reserved : 000000000000 @@ -48,11 +48,11 @@ [059h 0089 1] Reserved : 00 [05Ah 0090 2] Length : 0018 -[05Ch 0092 4] Endpoint start : 00001000 +[05Ch 0092 4] Endpoint start : 00003000 [060h 0096 2] PCI Segment start : 0000 [062h 0098 2] PCI Segment end : 0000 -[064h 0100 2] PCI BDF start : 1000 -[066h 0102 2] PCI BDF end : 10FF +[064h 0100 2] PCI BDF start : 3000 +[066h 0102 2] PCI BDF end : 30FF [068h 0104 2] Output node : 0030 [06Ah 0106 6] Reserved : 000000000000 @@ -62,6 +62,6 @@ 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....= BXPC 0020: 01 00 00 00 03 00 30 00 00 00 00 00 00 00 00 00 // ......0.....= .... 0030: 03 00 10 00 00 00 10 00 00 00 00 00 00 00 00 00 // ............= .... - 0040: 01 00 18 00 00 30 00 00 00 00 00 00 00 30 FF 30 // .....0......= .0.0 - 0050: 30 00 00 00 00 00 00 00 01 00 18 00 00 10 00 00 // 0...........= .... - 0060: 00 00 00 00 00 10 FF 10 30 00 00 00 00 00 00 00 // ........0...= .... + 0040: 01 00 18 00 00 10 00 00 00 00 00 00 00 10 FF 10 // ............= .... + 0050: 30 00 00 00 00 00 00 00 01 00 18 00 00 30 00 00 // 0...........= .0.. + 0060: 00 00 00 00 00 30 FF 30 30 00 00 00 00 00 00 00 // .....0.00...= .... Signed-off-by: Mark Cave-Ayland --- tests/data/acpi/q35/VIOT.viot | Bin 112 -> 112 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/q35/VIOT.viot b/tests/data/acpi/q35/VIOT.viot index 9b179266ccbf84f1c250ee646812d17e27987764..275c78fbe8e93190321d957c91c= 3f17551f865d4 100644 GIT binary patch delta 10 RcmXRYnBY1wR(PU=3D1OOI`1E2r^ delta 10 RcmXRYnBY1wR(PU=3D1OOI`1E2r^ diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 8367ffe1d4..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/VIOT", --=20 2.20.1