2022-11-08 06:41:59 +00:00
|
|
|
From 485bf2eb8edabd4553d995d5e32224df1e510aa2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
|
|
Date: Wed, 30 Mar 2022 14:52:34 -0400
|
|
|
|
|
Subject: [PATCH 17/18] tests: acpi: test short OEM_ID/OEM_TABLE_ID values in
|
2022-05-10 07:05:10 +00:00
|
|
|
test_oem_fields()
|
|
|
|
|
|
2022-11-08 06:41:59 +00:00
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
|
|
|
RH-MergeRequest: 141: acpi: fix QEMU crash when started with SLIC table
|
|
|
|
|
RH-Commit: [9/10] 31339223fb6c6cc32185b9fdaac76f2709b17ad6 (jmaloy/qemu-kvm)
|
|
|
|
|
RH-Bugzilla: 2062611
|
|
|
|
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
|
|
|
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062611
|
|
|
|
|
Upstream: Merged
|
|
|
|
|
|
|
|
|
|
commit 408ca92634770de5eac7965ed97c6260e770f2e7
|
|
|
|
|
Author: Igor Mammedov <imammedo@redhat.com>
|
|
|
|
|
Date: Fri Jan 14 09:26:41 2022 -0500
|
|
|
|
|
|
|
|
|
|
tests: acpi: test short OEM_ID/OEM_TABLE_ID values in test_oem_fields()
|
|
|
|
|
|
|
|
|
|
Previous patch [1] added explicit whitespace padding to OEM_ID/OEM_TABLE_ID
|
|
|
|
|
values used in test_oem_fields() testcase to avoid false positive and
|
|
|
|
|
bisection issues when QEMU is switched to \0' padding. As result
|
|
|
|
|
testcase ceased to test values that were shorter than max possible
|
|
|
|
|
length values.
|
|
|
|
|
|
|
|
|
|
Update testcase to make sure that it's testing shorter IDs like it
|
|
|
|
|
used to before [2].
|
|
|
|
|
|
|
|
|
|
1) "tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for test_oem_fields() test"
|
|
|
|
|
2) 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
|
|
Message-Id: <20220114142641.1727679-1-imammedo@redhat.com>
|
|
|
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
|
|
2022-05-10 07:05:10 +00:00
|
|
|
(cherry picked from commit 408ca92634770de5eac7965ed97c6260e770f2e7)
|
2022-11-08 06:41:59 +00:00
|
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
2022-05-10 07:05:10 +00:00
|
|
|
---
|
|
|
|
|
tests/qtest/bios-tables-test.c | 12 ++++++------
|
|
|
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
|
|
|
|
|
index 348fdbd202..515a647490 100644
|
|
|
|
|
--- a/tests/qtest/bios-tables-test.c
|
|
|
|
|
+++ b/tests/qtest/bios-tables-test.c
|
|
|
|
|
@@ -71,10 +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;
|
|
|
|
|
@@ -1495,8 +1495,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(strncmp((char *)sdt->aml + 10, OEM_ID, 6) == 0);
|
|
|
|
|
+ g_assert(strncmp((char *)sdt->aml + 16, OEM_TABLE_ID, 8) == 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
2.27.0
|
|
|
|
|
|
