111 lines
5.0 KiB
Diff
111 lines
5.0 KiB
Diff
From 6f89f06e686a61acf681038ac06732facc6e7b93 Mon Sep 17 00:00:00 2001
|
|
From: Yanan Wang <wangyanan55@huawei.com>
|
|
Date: Fri, 7 Jan 2022 16:32:32 +0800
|
|
Subject: [PATCH 20/24] tests/acpi/bios-table-test: Update expected virt/PPTT
|
|
file
|
|
|
|
Run ./tests/data/acpi/rebuild-expected-aml.sh from build directory
|
|
to update PPTT binary. Also empty bios-tables-test-allowed-diff.h.
|
|
|
|
The disassembled differences between actual and expected PPTT:
|
|
|
|
/*
|
|
* Intel ACPI Component Architecture
|
|
* AML/ASL+ Disassembler version 20200528 (64-bit version)
|
|
* Copyright (c) 2000 - 2020 Intel Corporation
|
|
*
|
|
- * Disassembly of tests/data/acpi/virt/PPTT, Tue Jan 4 12:51:11 2022
|
|
+ * Disassembly of /tmp/aml-2ZGOF1, Tue Jan 4 12:51:11 2022
|
|
*
|
|
* ACPI Data Table [PPTT]
|
|
*
|
|
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue
|
|
*/
|
|
|
|
[000h 0000 4] Signature : "PPTT" [Processor Properties Topology Table]
|
|
-[004h 0004 4] Table Length : 0000004C
|
|
+[004h 0004 4] Table Length : 00000060
|
|
[008h 0008 1] Revision : 02
|
|
-[009h 0009 1] Checksum : A8
|
|
+[009h 0009 1] Checksum : 48
|
|
[00Ah 0010 6] Oem ID : "BOCHS "
|
|
[010h 0016 8] Oem Table ID : "BXPC "
|
|
[018h 0024 4] Oem Revision : 00000001
|
|
[01Ch 0028 4] Asl Compiler ID : "BXPC"
|
|
[020h 0032 4] Asl Compiler Revision : 00000001
|
|
|
|
[024h 0036 1] Subtable Type : 00 [Processor Hierarchy Node]
|
|
[025h 0037 1] Length : 14
|
|
[026h 0038 2] Reserved : 0000
|
|
[028h 0040 4] Flags (decoded below) : 00000001
|
|
Physical package : 1
|
|
ACPI Processor ID valid : 0
|
|
Processor is a thread : 0
|
|
Node is a leaf : 0
|
|
Identical Implementation : 0
|
|
[02Ch 0044 4] Parent : 00000000
|
|
[030h 0048 4] ACPI Processor ID : 00000000
|
|
[034h 0052 4] Private Resource Number : 00000000
|
|
|
|
[038h 0056 1] Subtable Type : 00 [Processor Hierarchy Node]
|
|
[039h 0057 1] Length : 14
|
|
[03Ah 0058 2] Reserved : 0000
|
|
-[03Ch 0060 4] Flags (decoded below) : 0000000A
|
|
+[03Ch 0060 4] Flags (decoded below) : 00000000
|
|
Physical package : 0
|
|
- ACPI Processor ID valid : 1
|
|
+ ACPI Processor ID valid : 0
|
|
Processor is a thread : 0
|
|
- Node is a leaf : 1
|
|
+ Node is a leaf : 0
|
|
Identical Implementation : 0
|
|
[040h 0064 4] Parent : 00000024
|
|
[044h 0068 4] ACPI Processor ID : 00000000
|
|
[048h 0072 4] Private Resource Number : 00000000
|
|
|
|
-Raw Table Data: Length 76 (0x4C)
|
|
+[04Ch 0076 1] Subtable Type : 00 [Processor Hierarchy Node]
|
|
+[04Dh 0077 1] Length : 14
|
|
+[04Eh 0078 2] Reserved : 0000
|
|
+[050h 0080 4] Flags (decoded below) : 0000000A
|
|
+ Physical package : 0
|
|
+ ACPI Processor ID valid : 1
|
|
+ Processor is a thread : 0
|
|
+ Node is a leaf : 1
|
|
+ Identical Implementation : 0
|
|
+[054h 0084 4] Parent : 00000038
|
|
+[058h 0088 4] ACPI Processor ID : 00000000
|
|
+[05Ch 0092 4] Private Resource Number : 00000000
|
|
+
|
|
+Raw Table Data: Length 96 (0x60)
|
|
|
|
- 0000: 50 50 54 54 4C 00 00 00 02 A8 42 4F 43 48 53 20 // PPTTL.....BOCHS
|
|
+ 0000: 50 50 54 54 60 00 00 00 02 48 42 4F 43 48 53 20 // PPTT`....HBOCHS
|
|
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 14 00 00 01 00 00 00 00 00 00 00 // ................
|
|
- 0030: 00 00 00 00 00 00 00 00 00 14 00 00 0A 00 00 00 // ................
|
|
- 0040: 24 00 00 00 00 00 00 00 00 00 00 00 // $...........
|
|
+ 0030: 00 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // ................
|
|
+ 0040: 24 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // $...............
|
|
+ 0050: 0A 00 00 00 38 00 00 00 00 00 00 00 00 00 00 00 // ....8...........
|
|
|
|
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Reviewed-by: Ani Sinha <ani@anisinha.ca>
|
|
Message-id: 20220107083232.16256-7-wangyanan55@huawei.com
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
---
|
|
tests/data/acpi/virt/PPTT | Bin 76 -> 96 bytes
|
|
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
|
|
2 files changed, 1 deletion(-)
|
|
|
|
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
|
|
index cb143a55a6..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/PPTT",
|
|
--
|
|
2.27.0
|
|
|