From nobody Sat May 10 01:58:35 2025
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=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1708018575; cv=none;
d=zohomail.com; s=zohoarc;
b=gU8Q8hWx95SvymSV/HQyBIc/FeGmhLd4FiCRfDmvLLpTEsdQaK6ieYnNBT7dpISa1i0akS49mzDp2Lx1i14WU/hzst7YNFo7ZuQupAh9iP9zGJNaZGsdei0BiLDT9hqzPk31odDmPd09roJ0b1pEgzt/gaQ6rRnjBmlu6tvexro=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1708018575;
h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc;
bh=HW07AFrfZUs7Nj6WN1tMAA+kc9ODE+bXQJgc6YEpBF0=;
b=KRAxGsdvLgTHmBBOnrGKE3St9odmVSeGHgXzHlQ7TQxCAAerZopzV6PVl70IV5mGYBdlFWIM7EOI6CF2LCKVZbaxNnniJYcjgUmj9t9p1BjZ+eVfzXueCmWXeV6YqZdSKj5z0jU0F9VFx/JSqrmwDzT0IJWxeevTrySxvRsOafA=
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=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1708018575524194.4732534823694;
Thu, 15 Feb 2024 09:36:15 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1rafea-00085r-KF; Thu, 15 Feb 2024 12:36:10 -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 <peter.maydell@linaro.org>)
id 1rafeM-0007zC-9A
for qemu-devel@nongnu.org; Thu, 15 Feb 2024 12:35:54 -0500
Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1rafeE-0003wg-Nm
for qemu-devel@nongnu.org; Thu, 15 Feb 2024 12:35:53 -0500
Received: by mail-wr1-x430.google.com with SMTP id
ffacd0b85a97d-33b66a7f859so378717f8f.3
for <qemu-devel@nongnu.org>; Thu, 15 Feb 2024 09:35:46 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
q16-20020adfea10000000b0033cfa00e497sm2384129wrm.64.2024.02.15.09.35.44
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 15 Feb 2024 09:35:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1708018545; x=1708623345; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=HW07AFrfZUs7Nj6WN1tMAA+kc9ODE+bXQJgc6YEpBF0=;
b=jocCiTNVDq0CnipRB9wSk9nA/3I1GwqOAOCxJTnE8fhhdUrK5OntzywvSkRLpeL2Vz
4oJ4yFczEKxTqy50y4PUylbKRHC41kZcH/Kyn/ZeZdJh+G/nbv4dlvvZEgvVskQ7R64+
NYB0qs7gan8VeXITn2gmuZGECgesDsCoQKlretIIoPkp++69iTzSbWbUH4bCx7IK/Ga6
fnPqYayXWyU1TUw00gP72g62Aj8a8vZPP4Fitsnl3V3J1cBxQUg1HohyRjhLiRUL1PsY
LD/MfdEfcvyHIyuQEQBKzv0uZnJjfTKm7yv9U/q5Zr1DIwncJInBpb6FEF1zAFlk+gnP
H5Gw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1708018545; x=1708623345;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=HW07AFrfZUs7Nj6WN1tMAA+kc9ODE+bXQJgc6YEpBF0=;
b=A7JAuQjFmGJyHE0rTuOSDW0ug7M9VYAS8vNXZDgV22zV8sDVvDpaLrkyO/zLTB4cp/
WRn0INfd94UpJNXlCKrON6mlLm0HBt/vXMti46Ci8x2tC56mG/u/Q84hytiETmqt4qZ/
xdFHl3OjV3fUJxSe3cPe7IdljDaYF430tum8xGETdQgOJVCZbN2lS9p2pxqurX8XFS7u
SKTu/dAGoJOdh2FrAyRT/vBOTSZlAZjvX9lGoN4sBktZuPpO2oVWGHfQFi13PbVNBmg9
TP++9ViYFZMD+mrQS/u/xB6vQY4vq9+MkcGuFqrkXRSwqWE65RQCJP89kuH4xwTIcJkt
XglQ==
X-Gm-Message-State: AOJu0YygrOZOxXSOiR+MbBgDJwiUsmpXWA/WrBJkub6VZ3pLV9edq0gV
kkMWQjGR/82BMGi9TU6H71aefS7t0IBMcIDigf9T6lkedyUabA8HlomldiOvRQNFCzDwUbVdz1b
B
X-Google-Smtp-Source:
AGHT+IE1b+RjQQDakzvYZOtHKuV922c8o0oxC47t2oDmy07Tcw2UGkMUHFXVWLqPoqRfv+W7dsBKBQ==
X-Received: by 2002:a5d:4acc:0:b0:33c:e2b0:600e with SMTP id
y12-20020a5d4acc000000b0033ce2b0600emr2082951wrs.32.1708018545174;
Thu, 15 Feb 2024 09:35:45 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 13/35] tests/qtest/bios-tables-tests: Update virt golden
reference
Date: Thu, 15 Feb 2024 17:35:16 +0000
Message-Id: <20240215173538.2430599-14-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240215173538.2430599-1-peter.maydell@linaro.org>
References: <20240215173538.2430599-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
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=2a00:1450:4864:20::430;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.google.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, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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 @linaro.org)
X-ZM-MESSAGEID: 1708018576012100001
Content-Type: text/plain; charset="utf-8"
Update the virt golden reference files to say that the FACP is ACPI
v6.3, and the GTDT table is a revision 3 table with space for the
virtual EL2 timer.
Diffs from iasl:
@@ -1,32 +1,32 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20200925 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/FACP, Mon Jan 22 13:48:40 2024
+ * Disassembly of /tmp/aml-W8RZH2, Mon Jan 22 13:48:40 2024
*
* ACPI Data Table [FACP]
*
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue
*/
[000h 0000 4] Signature : "FACP" [Fixed ACPI Descr=
iption Table (FADT)]
[004h 0004 4] Table Length : 00000114
[008h 0008 1] Revision : 06
-[009h 0009 1] Checksum : 15
+[009h 0009 1] Checksum : 12
[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 4] FACS Address : 00000000
[028h 0040 4] DSDT Address : 00000000
[02Ch 0044 1] Model : 00
[02Dh 0045 1] PM Profile : 00 [Unspecified]
[02Eh 0046 2] SCI Interrupt : 0000
[030h 0048 4] SMI Command Port : 00000000
[034h 0052 1] ACPI Enable Value : 00
[035h 0053 1] ACPI Disable Value : 00
[036h 0054 1] S4BIOS Command : 00
[037h 0055 1] P-State Control : 00
@@ -86,33 +86,33 @@
Use APIC Physical Destination Mode (V4) : 0
Hardware Reduced (V5) : 1
Low Power S0 Idle (V5) : 0
[074h 0116 12] Reset Register : [Generic Address Structure]
[074h 0116 1] Space ID : 00 [SystemMemory]
[075h 0117 1] Bit Width : 00
[076h 0118 1] Bit Offset : 00
[077h 0119 1] Encoded Access Width : 00 [Undefined/Legacy]
[078h 0120 8] Address : 0000000000000000
[080h 0128 1] Value to cause reset : 00
[081h 0129 2] ARM Flags (decoded below) : 0003
PSCI Compliant : 1
Must use HVC for PSCI : 1
-[083h 0131 1] FADT Minor Revision : 00
+[083h 0131 1] FADT Minor Revision : 03
[084h 0132 8] FACS Address : 0000000000000000
[08Ch 0140 8] DSDT Address : 0000000000000000
[094h 0148 12] PM1A Event Block : [Generic Address Structure]
[094h 0148 1] Space ID : 00 [SystemMemory]
[095h 0149 1] Bit Width : 00
[096h 0150 1] Bit Offset : 00
[097h 0151 1] Encoded Access Width : 00 [Undefined/Legacy]
[098h 0152 8] Address : 0000000000000000
[0A0h 0160 12] PM1B Event Block : [Generic Address Structure]
[0A0h 0160 1] Space ID : 00 [SystemMemory]
[0A1h 0161 1] Bit Width : 00
[0A2h 0162 1] Bit Offset : 00
[0A3h 0163 1] Encoded Access Width : 00 [Undefined/Legacy]
[0A4h 0164 8] Address : 0000000000000000
@@ -164,34 +164,34 @@
[0F5h 0245 1] Bit Width : 00
[0F6h 0246 1] Bit Offset : 00
[0F7h 0247 1] Encoded Access Width : 00 [Undefined/Legacy]
[0F8h 0248 8] Address : 0000000000000000
[100h 0256 12] Sleep Status Register : [Generic Address Structure]
[100h 0256 1] Space ID : 00 [SystemMemory]
[101h 0257 1] Bit Width : 00
[102h 0258 1] Bit Offset : 00
[103h 0259 1] Encoded Access Width : 00 [Undefined/Legacy]
[104h 0260 8] Address : 0000000000000000
[10Ch 0268 8] Hypervisor ID : 00000000554D4551
Raw Table Data: Length 276 (0x114)
- 0000: 46 41 43 50 14 01 00 00 06 15 42 4F 43 48 53 20 // FACP......BO=
CHS
+ 0000: 46 41 43 50 14 01 00 00 06 12 42 4F 43 48 53 20 // FACP......BO=
CHS
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 00 00 00 00 00 00 00 00 00 00 // ............=
....
0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
0070: 00 00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
- 0080: 00 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
+ 0080: 00 03 00 03 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
00A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
00B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
00C0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
00D0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
00E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
00F0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ............=
....
0100: 00 00 00 00 00 00 00 00 00 00 00 00 51 45 4D 55 // ............=
QEMU
0110: 00 00 00 00 // ....
@@ -1,32 +1,32 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20200925 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/GTDT, Mon Jan 22 13:48:40 2024
+ * Disassembly of /tmp/aml-XDSZH2, Mon Jan 22 13:48:40 2024
*
* ACPI Data Table [GTDT]
*
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue
*/
[000h 0000 4] Signature : "GTDT" [Generic Timer De=
scription Table]
-[004h 0004 4] Table Length : 00000060
-[008h 0008 1] Revision : 02
-[009h 0009 1] Checksum : 9C
+[004h 0004 4] Table Length : 00000068
+[008h 0008 1] Revision : 03
+[009h 0009 1] Checksum : 93
[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 8] Counter Block Address : FFFFFFFFFFFFFFFF
[02Ch 0044 4] Reserved : 00000000
[030h 0048 4] Secure EL1 Interrupt : 0000001D
[034h 0052 4] EL1 Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
Always On : 0
[038h 0056 4] Non-Secure EL1 Interrupt : 0000001E
@@ -37,25 +37,28 @@
[040h 0064 4] Virtual Timer Interrupt : 0000001B
[044h 0068 4] VT Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
Always On : 0
[048h 0072 4] Non-Secure EL2 Interrupt : 0000001A
[04Ch 0076 4] NEL2 Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
Always On : 0
[050h 0080 8] Counter Read Block Address : FFFFFFFFFFFFFFFF
[058h 0088 4] Platform Timer Count : 00000000
[05Ch 0092 4] Platform Timer Offset : 00000000
+[060h 0096 4] Virtual EL2 Timer GSIV : 00000000
+[064h 0100 4] Virtual EL2 Timer Flags : 00000000
-Raw Table Data: Length 96 (0x60)
+Raw Table Data: Length 104 (0x68)
- 0000: 47 54 44 54 60 00 00 00 02 9C 42 4F 43 48 53 20 // GTDT`.....BO=
CHS
+ 0000: 47 54 44 54 68 00 00 00 03 93 42 4F 43 48 53 20 // GTDTh.....BO=
CHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....=
BXPC
0020: 01 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 // ............=
....
0030: 1D 00 00 00 00 00 00 00 1E 00 00 00 04 00 00 00 // ............=
....
0040: 1B 00 00 00 00 00 00 00 1A 00 00 00 00 00 00 00 // ............=
....
0050: FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 // ............=
....
+ 0060: 00 00 00 00 00 00 00 00 // ........
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Message-id: 20240122143537.233498-4-peter.maydell@linaro.org
---
tests/qtest/bios-tables-test-allowed-diff.h | 2 --
tests/data/acpi/virt/FACP | Bin 276 -> 276 bytes
tests/data/acpi/virt/GTDT | Bin 96 -> 104 bytes
3 files changed, 2 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios=
-tables-test-allowed-diff.h
index 7a6d4f80214..dfb8523c8bf 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,3 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/virt/FACP",
-"tests/data/acpi/virt/GTDT",
diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/FACP
index ac05c35a69451519bd1152c54d1e741af36390f5..da0c3644cc4536a0a0141603ed4=
70bd11492b678 100644
GIT binary patch
delta 25
gcmbQjG=3D+)F&CxkPgpq-PO=3Du!l<;2F$$vli407<0<)c^nh
delta 28
kcmbQjG=3D+)F&CxkPgpq-PO>`nx<-|!<6Akz$^DuG%0AAS!ssI20
diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/GTDT
index 6f8cb9b8f30b55f4c93fe515982621e3db50feb2..7f330e04d144f9cc22eef06127e=
cc19abf9e8009 100644
GIT binary patch
delta 25
bcmYeu;BpUf3CUn!U|^m+kt>V?$N&QXMtB4L
delta 16
Xcmc~u;BpUf2}xjJU|^avkt+-UB60)u
--=20
2.34.1