From: Eric DeVolder Date: Wed, 17 May 2023 16:25:45 +0000 (-0400) Subject: ACPI: bios-tables-test.c step 5 (update expected table binaries) X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1141159cb471b89a63c256902f315bcf8dcf7d5e;p=qmiga%2Fqemu.git ACPI: bios-tables-test.c step 5 (update expected table binaries) Following the guidelines in tests/qtest/bios-tables-test.c, this is step 5 and 6. An examination of all the files impacted (as listed in bios-tables-test-allowe-diff.h) shows only the MADT/APIC tables bumping revision from 1 to 3, and a corresponding change to the checksum. The below diff is typical: --- /tmp/asl-1F9641.dsl 2023-05-16 15:18:31.292579156 -0400 +++ /tmp/asl-GVD741.dsl 2023-05-16 15:18:31.291579149 -0400 @@ -1,32 +1,32 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20230331 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * - * Disassembly of tests/data/acpi/pc/APIC, Tue May 16 15:18:31 2023 + * Disassembly of /tmp/aml-R4D741, Tue May 16 15:18:31 2023 * * ACPI Data Table [APIC] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue (in hex) */ [000h 0000 004h] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 004h] Table Length : 00000078 -[008h 0008 001h] Revision : 01 -[009h 0009 001h] Checksum : 8A +[008h 0008 001h] Revision : 03 +[009h 0009 001h] Checksum : 88 [00Ah 0010 006h] Oem ID : "BOCHS " [010h 0016 008h] Oem Table ID : "BXPC " [018h 0024 004h] Oem Revision : 00000001 [01Ch 0028 004h] Asl Compiler ID : "BXPC" [020h 0032 004h] Asl Compiler Revision : 00000001 [024h 0036 004h] Local Apic Address : FEE00000 [028h 0040 004h] Flags (decoded below) : 00000001 PC-AT Compatibility : 1 [02Ch 0044 001h] Subtable Type : 00 [Processor Local APIC] [02Dh 0045 001h] Length : 08 [02Eh 0046 001h] Processor ID : 00 [02Fh 0047 001h] Local Apic ID : 00 [030h 0048 004h] Flags (decoded below) : 00000001 Processor Enabled : 1 @@ -81,24 +81,24 @@ [06Bh 0107 001h] Source : 0B [06Ch 0108 004h] Interrupt : 0000000B [070h 0112 002h] Flags (decoded below) : 000D Polarity : 1 Trigger Mode : 3 [072h 0114 001h] Subtable Type : 04 [Local APIC NMI] [073h 0115 001h] Length : 06 [074h 0116 001h] Processor ID : FF [075h 0117 002h] Flags (decoded below) : 0000 Polarity : 0 Trigger Mode : 0 [077h 0119 001h] Interrupt Input LINT : 01 Raw Table Data: Length 120 (0x78) - 0000: 41 50 49 43 78 00 00 00 01 8A 42 4F 43 48 53 20 // APICx.....BOCHS + 0000: 41 50 49 43 78 00 00 00 03 88 42 4F 43 48 53 20 // APICx.....BOCHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC 0020: 01 00 00 00 00 00 E0 FE 01 00 00 00 00 08 00 00 // ................ 0030: 01 00 00 00 01 0C 00 00 00 00 C0 FE 00 00 00 00 // ................ 0040: 02 0A 00 00 02 00 00 00 00 00 02 0A 00 05 05 00 // ................ 0050: 00 00 0D 00 02 0A 00 09 09 00 00 00 0D 00 02 0A // ................ 0060: 00 0A 0A 00 00 00 0D 00 02 0A 00 0B 0B 00 00 00 // ................ 0070: 0D 00 04 06 FF 00 00 01 // ........ Signed-off-by: Eric DeVolder Message-Id: <20230517162545.2191-4-eric.devolder@oracle.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Acked-by: Ani Sinha --- diff --git a/tests/data/acpi/microvm/APIC b/tests/data/acpi/microvm/APIC index 68dbd44a7e..672764e711 100644 Binary files a/tests/data/acpi/microvm/APIC and b/tests/data/acpi/microvm/APIC differ diff --git a/tests/data/acpi/microvm/APIC.ioapic2 b/tests/data/acpi/microvm/APIC.ioapic2 index 3063c52cd3..6f24fdb12c 100644 Binary files a/tests/data/acpi/microvm/APIC.ioapic2 and b/tests/data/acpi/microvm/APIC.ioapic2 differ diff --git a/tests/data/acpi/microvm/APIC.pcie b/tests/data/acpi/microvm/APIC.pcie index 4e8f6ed8d6..2239ca76a6 100644 Binary files a/tests/data/acpi/microvm/APIC.pcie and b/tests/data/acpi/microvm/APIC.pcie differ diff --git a/tests/data/acpi/pc/APIC b/tests/data/acpi/pc/APIC index 208331db53..868a3432f0 100644 Binary files a/tests/data/acpi/pc/APIC and b/tests/data/acpi/pc/APIC differ diff --git a/tests/data/acpi/pc/APIC.acpihmat b/tests/data/acpi/pc/APIC.acpihmat index 812c4603f2..125d1ff087 100644 Binary files a/tests/data/acpi/pc/APIC.acpihmat and b/tests/data/acpi/pc/APIC.acpihmat differ diff --git a/tests/data/acpi/pc/APIC.cphp b/tests/data/acpi/pc/APIC.cphp index 65cc4f4a9a..a2c2a24e5e 100644 Binary files a/tests/data/acpi/pc/APIC.cphp and b/tests/data/acpi/pc/APIC.cphp differ diff --git a/tests/data/acpi/pc/APIC.dimmpxm b/tests/data/acpi/pc/APIC.dimmpxm index d904d4a70d..9b5922bc72 100644 Binary files a/tests/data/acpi/pc/APIC.dimmpxm and b/tests/data/acpi/pc/APIC.dimmpxm differ diff --git a/tests/data/acpi/q35/APIC b/tests/data/acpi/q35/APIC index 208331db53..868a3432f0 100644 Binary files a/tests/data/acpi/q35/APIC and b/tests/data/acpi/q35/APIC differ diff --git a/tests/data/acpi/q35/APIC.acpihmat b/tests/data/acpi/q35/APIC.acpihmat index 812c4603f2..125d1ff087 100644 Binary files a/tests/data/acpi/q35/APIC.acpihmat and b/tests/data/acpi/q35/APIC.acpihmat differ diff --git a/tests/data/acpi/q35/APIC.acpihmat-noinitiator b/tests/data/acpi/q35/APIC.acpihmat-noinitiator index d904d4a70d..9b5922bc72 100644 Binary files a/tests/data/acpi/q35/APIC.acpihmat-noinitiator and b/tests/data/acpi/q35/APIC.acpihmat-noinitiator differ diff --git a/tests/data/acpi/q35/APIC.core-count2 b/tests/data/acpi/q35/APIC.core-count2 index a255082ef5..f5da2eb1e8 100644 Binary files a/tests/data/acpi/q35/APIC.core-count2 and b/tests/data/acpi/q35/APIC.core-count2 differ diff --git a/tests/data/acpi/q35/APIC.cphp b/tests/data/acpi/q35/APIC.cphp index 65cc4f4a9a..a2c2a24e5e 100644 Binary files a/tests/data/acpi/q35/APIC.cphp and b/tests/data/acpi/q35/APIC.cphp differ diff --git a/tests/data/acpi/q35/APIC.dimmpxm b/tests/data/acpi/q35/APIC.dimmpxm index d904d4a70d..9b5922bc72 100644 Binary files a/tests/data/acpi/q35/APIC.dimmpxm and b/tests/data/acpi/q35/APIC.dimmpxm differ diff --git a/tests/data/acpi/q35/APIC.xapic b/tests/data/acpi/q35/APIC.xapic index c1969c35aa..83bd28325a 100644 Binary files a/tests/data/acpi/q35/APIC.xapic and b/tests/data/acpi/q35/APIC.xapic differ diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 66ae44e6b9..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,15 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/microvm/APIC", -"tests/data/acpi/microvm/APIC.ioapic2", -"tests/data/acpi/microvm/APIC.pcie", -"tests/data/acpi/pc/APIC", -"tests/data/acpi/pc/APIC.acpihmat", -"tests/data/acpi/pc/APIC.cphp", -"tests/data/acpi/pc/APIC.dimmpxm", -"tests/data/acpi/q35/APIC", -"tests/data/acpi/q35/APIC.acpihmat", -"tests/data/acpi/q35/APIC.acpihmat-noinitiator", -"tests/data/acpi/q35/APIC.core-count2", -"tests/data/acpi/q35/APIC.cphp", -"tests/data/acpi/q35/APIC.dimmpxm", -"tests/data/acpi/q35/APIC.xapic",