|
 |
4841a6 |
From a132a22e316121cf00ff733afb1ad1dc313e14b3 Mon Sep 17 00:00:00 2001
|
|
|
4841a6 |
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
4841a6 |
Date: Wed, 30 Mar 2022 14:52:34 -0400
|
|
|
4841a6 |
Subject: [PATCH 14/18] tests: acpi: whitelist nvdimm's SSDT and FACP.slic
|
|
|
60061b |
expected blobs
|
|
|
60061b |
|
|
|
4841a6 |
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
|
4841a6 |
RH-MergeRequest: 141: acpi: fix QEMU crash when started with SLIC table
|
|
|
4841a6 |
RH-Commit: [6/10] 3f3a929cde82f228da1e4bc66e4c869467c0289c (jmaloy/qemu-kvm)
|
|
|
4841a6 |
RH-Bugzilla: 2062611
|
|
|
4841a6 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
4841a6 |
|
|
|
4841a6 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062611
|
|
|
4841a6 |
Upstream: Merged
|
|
|
4841a6 |
|
|
|
4841a6 |
commit d1e4a4654154925eddf0fc449fa9c92b806b9c8c
|
|
|
4841a6 |
Author: Igor Mammedov <imammedo@redhat.com>
|
|
|
4841a6 |
Date: Wed Jan 12 08:03:30 2022 -0500
|
|
|
4841a6 |
|
|
|
4841a6 |
tests: acpi: whitelist nvdimm's SSDT and FACP.slic expected blobs
|
|
|
4841a6 |
|
|
|
4841a6 |
The next commit will revert OEM fields whitespace padding to
|
|
|
4841a6 |
padding with '\0' as it was before [1]. That will change OEM
|
|
|
4841a6 |
Table ID for:
|
|
|
4841a6 |
* SSDT.*: where it was padded from 6 characters to 8
|
|
|
4841a6 |
* FACP.slic: where it was padded from 2 characters to 8
|
|
|
4841a6 |
after reverting whitespace padding, it will be replaced with
|
|
|
4841a6 |
'\0' which effectively will shorten OEM table ID to 6 and 2
|
|
|
4841a6 |
characters.
|
|
|
4841a6 |
|
|
|
4841a6 |
Whitelist affected tables before introducing the change.
|
|
|
4841a6 |
|
|
|
4841a6 |
1) 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
|
|
4841a6 |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
4841a6 |
Message-Id: <20220112130332.1648664-3-imammedo@redhat.com>
|
|
|
4841a6 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
4841a6 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
4841a6 |
|
|
|
60061b |
(cherry picked from commit d1e4a4654154925eddf0fc449fa9c92b806b9c8c)
|
|
|
4841a6 |
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
60061b |
---
|
|
|
60061b |
tests/qtest/bios-tables-test-allowed-diff.h | 4 ++++
|
|
|
60061b |
1 file changed, 4 insertions(+)
|
|
|
60061b |
|
|
|
60061b |
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
|
|
|
60061b |
index dfb8523c8b..7faa8f53be 100644
|
|
|
60061b |
--- a/tests/qtest/bios-tables-test-allowed-diff.h
|
|
|
60061b |
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
|
|
|
60061b |
@@ -1 +1,5 @@
|
|
|
60061b |
/* List of comma-separated changed AML files to ignore */
|
|
|
60061b |
+"tests/data/acpi/virt/SSDT.memhp",
|
|
|
60061b |
+"tests/data/acpi/pc/SSDT.dimmpxm",
|
|
|
60061b |
+"tests/data/acpi/q35/SSDT.dimmpxm",
|
|
|
60061b |
+"tests/data/acpi/q35/FACP.slic",
|
|
|
60061b |
--
|
|
|
60061b |
2.27.0
|
|
|
60061b |
|