On 31/07/2017 18:40, Igor Mammedov wrote:
> Main purpose of test_dst_table() is loading a table from QEMU
> with checking that checksum in header matches actual one,
> rename it reflect main action it performs.
>
> Likewise test_acpi_tables() name is to broad, while the function
> only loads tables referenced by RSDT, rename it to reflect it.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> tests/bios-tables-test.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index adbcc55..ed32e9a 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -206,7 +206,11 @@ static void test_acpi_facs_table(test_data *data)
> ACPI_ASSERT_CMP(facs_table->signature, "FACS");
> }
>
> -static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr)
> +/** fetch_table
> + * load ACPI table at @addr into table descriptor @sdt_table
> + * and check that header checksum matches actual one.
> + */
> +static void fetch_table(AcpiSdtTable *sdt_table, uint32_t addr)
> {
> uint8_t checksum;
>
> @@ -229,14 +233,15 @@ static void test_acpi_dsdt_table(test_data *data)
> AcpiSdtTable dsdt_table;
> uint32_t addr = data->fadt_table.dsdt;
>
> - test_dst_table(&dsdt_table, addr);
> + fetch_table(&dsdt_table, addr);
> ACPI_ASSERT_CMP(dsdt_table.header.signature, "DSDT");
>
> /* Since DSDT isn't in RSDT, add DSDT to ASL test tables list manually */
> g_array_append_val(data->tables, dsdt_table);
> }
>
> -static void test_acpi_tables(test_data *data)
> +/* Load all tables and add to test list directly RSDT referenced tables */
> +static void fetch_rsdt_referenced_tables(test_data *data)
> {
> int tables_nr = data->rsdt_tables_nr - 1; /* fadt is first */
> int i;
> @@ -245,7 +250,7 @@ static void test_acpi_tables(test_data *data)
> AcpiSdtTable ssdt_table;
>
> uint32_t addr = data->rsdt_tables_addr[i + 1]; /* fadt is first */
> - test_dst_table(&ssdt_table, addr);
> + fetch_table(&ssdt_table, addr);
> g_array_append_val(data->tables, ssdt_table);
> }
> }
> @@ -638,7 +643,7 @@ static void test_acpi_one(const char *params, test_data *data)
> test_acpi_fadt_table(data);
> test_acpi_facs_table(data);
> test_acpi_dsdt_table(data);
> - test_acpi_tables(data);
> + fetch_rsdt_referenced_tables(data);
>
> if (iasl) {
> if (getenv(ACPI_REBUILD_EXPECTED_AML)) {
>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks,
Marcel