bc9be573e5
https://bugzilla.redhat.com/show_bug.cgi?id=2020186 Signed-off-by: Cole Robinson <crobinso@redhat.com>
66 lines
2.4 KiB
Diff
66 lines
2.4 KiB
Diff
From 06e277d27dae489dcd3d70cc8c84b20015777978 Mon Sep 17 00:00:00 2001
|
|
From: Igor Mammedov <imammedo@redhat.com>
|
|
Date: Wed, 12 Jan 2022 08:03:29 -0500
|
|
Subject: [PATCH] tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for
|
|
test_oem_fields() test
|
|
Content-type: text/plain
|
|
|
|
The next commit will revert OEM fields padding with whitespace to
|
|
padding with '\0' as it was before [1]. As result test_oem_fields() will
|
|
fail due to unexpectedly smaller ID sizes read from QEMU ACPI tables.
|
|
|
|
Pad OEM_ID/OEM_TABLE_ID manually with spaces so that values the test
|
|
puts on QEMU CLI and expected values match.
|
|
|
|
1) 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
|
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
Message-Id: <20220112130332.1648664-2-imammedo@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit a849522f726767022203ef2b6c395ea19facb866)
|
|
---
|
|
tests/qtest/bios-tables-test.c | 15 ++++++---------
|
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
|
|
index 258874167e..f5ae719b96 100644
|
|
--- a/tests/qtest/bios-tables-test.c
|
|
+++ b/tests/qtest/bios-tables-test.c
|
|
@@ -71,9 +71,10 @@
|
|
|
|
#define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML"
|
|
|
|
-#define OEM_ID "TEST"
|
|
-#define OEM_TABLE_ID "OEM"
|
|
-#define OEM_TEST_ARGS "-machine x-oem-id="OEM_ID",x-oem-table-id="OEM_TABLE_ID
|
|
+#define OEM_ID "TEST "
|
|
+#define OEM_TABLE_ID "OEM "
|
|
+#define OEM_TEST_ARGS "-machine x-oem-id='" OEM_ID "',x-oem-table-id='" \
|
|
+ OEM_TABLE_ID "'"
|
|
|
|
typedef struct {
|
|
bool tcg_only;
|
|
@@ -1468,11 +1469,7 @@ static void test_acpi_virt_tcg(void)
|
|
static void test_oem_fields(test_data *data)
|
|
{
|
|
int i;
|
|
- char oem_id[6];
|
|
- char oem_table_id[8];
|
|
|
|
- strpadcpy(oem_id, sizeof oem_id, OEM_ID, ' ');
|
|
- strpadcpy(oem_table_id, sizeof oem_table_id, OEM_TABLE_ID, ' ');
|
|
for (i = 0; i < data->tables->len; ++i) {
|
|
AcpiSdtTable *sdt;
|
|
|
|
@@ -1482,8 +1479,8 @@ static void test_oem_fields(test_data *data)
|
|
continue;
|
|
}
|
|
|
|
- g_assert(memcmp(sdt->aml + 10, oem_id, 6) == 0);
|
|
- g_assert(memcmp(sdt->aml + 16, oem_table_id, 8) == 0);
|
|
+ g_assert(memcmp(sdt->aml + 10, OEM_ID, 6) == 0);
|
|
+ g_assert(memcmp(sdt->aml + 16, OEM_TABLE_ID, 8) == 0);
|
|
}
|
|
}
|
|
|