Commit 55089fa2 authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

tests: acpi: fetch X_DSDT if pointer to DSDT is 0 



that way it would be possible to test a DSDT pointed by
64bit X_DSDT field in FADT.

PS:
it will allow to enable testing arm/virt board, which sets
only newer X_DSDT field.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1556808723-226478-6-git-send-email-imammedo@redhat.com>
Reviewed-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 9c041885

tests/bios-tables-test.c

+10 −1
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ static void test_acpi_fadt_table(test_data *data) 
    AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);

    uint8_t *fadt_aml = table.aml;

    uint32_t fadt_len = table.aml_len;

    uint32_t val;

    int dsdt_offset = 40 /* DSDT */;

    int dsdt_entry_size = 4;



    g_assert(compare_signature(&table, "FACP"));
@@ -148,8 +151,14 @@ static void test_acpi_fadt_table(test_data *data) 
                     fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false);

    g_array_append_val(data->tables, table);



    memcpy(&val, fadt_aml + dsdt_offset, 4);

    val = le32_to_cpu(val);

    if (!val) {

        dsdt_offset = 140 /* X_DSDT */;

        dsdt_entry_size = 8;

    }

    acpi_fetch_table(data->qts, &table.aml, &table.aml_len,

                     fadt_aml + 40 /* DSDT */, 4, "DSDT", true);

                     fadt_aml + dsdt_offset, dsdt_entry_size, "DSDT", true);

    g_array_append_val(data->tables, table);



    memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */