OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for test_oem_fields() test

Browse Source 
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>
This commit is contained in:
Igor Mammedov 2022-01-12 08:03:29 -05:00 committed by Michael S. Tsirkin
parent 274f5e6343
commit a849522f72
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/qtest/bios-tables-test.c
View File

@ -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;
@ -1519,11 +1520,7 @@ static void test_acpi_q35_slic(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;
@ -1533,8 +1530,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);
}
}