From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWQAt-0001ZY-6M for qemu-devel@nongnu.org; Mon, 10 Dec 2018 13:21:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWQAp-0006TG-W0 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 13:20:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56172) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWQAp-0006SA-IV for qemu-devel@nongnu.org; Mon, 10 Dec 2018 13:20:55 -0500 From: Igor Mammedov Date: Mon, 10 Dec 2018 19:10:14 +0100 Message-Id: <1544465415-207855-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1544465415-207855-1-git-send-email-imammedo@redhat.com> References: <1544465415-207855-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 8/9] tests: acpi: squash sanitize_fadt_ptrs() into test_acpi_fadt_table() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Thomas Huth , Laurent Vivier , Samuel Ortiz some parts of sanitize_fadt_ptrs() do redundant job - locating FADT - checking original checksum There is no need to do it as test_acpi_fadt_table() already does that, so drop duplicate code and move remaining fixup code into test_acpi_fadt_table(). Signed-off-by: Igor Mammedov --- tests/bios-tables-test.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 9aa7c86..40b224f 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -126,6 +126,7 @@ static void test_acpi_fadt_table(test_data *data) /* FADT table is 1st */ AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0); uint8_t *fadt_aml = table.aml; + uint32_t fadt_len = table.aml_len; ACPI_ASSERT_CMP(table.header->signature, "FACP"); @@ -137,36 +138,17 @@ static void test_acpi_fadt_table(test_data *data) acpi_fetch_table(&table.aml, &table.aml_len, fadt_aml + 40 /* DSDT */, "DSDT", true); g_array_append_val(data->tables, table); -} - -static void sanitize_fadt_ptrs(test_data *data) -{ - /* fixup pointers in FADT */ - int i; - - for (i = 0; i < data->tables->len; i++) { - AcpiSdtTable *sdt = &g_array_index(data->tables, AcpiSdtTable, i); - - if (memcmp(&sdt->header->signature, "FACP", 4)) { - continue; - } - /* check original FADT checksum before sanitizing table */ - g_assert(!acpi_calc_checksum((uint8_t *)sdt->aml, sdt->aml_len)); - - /* sdt->aml field offset := spec offset - header size */ - memset(sdt->aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ - memset(sdt->aml + 40, 0, 4); /* sanitize DSDT ptr */ - if (sdt->header->revision >= 3) { - memset(sdt->aml + 132, 0, 8); /* sanitize X_FIRMWARE_CTRL ptr */ - memset(sdt->aml + 140, 0, 8); /* sanitize X_DSDT ptr */ - } - - /* update checksum */ - sdt->header->checksum = 0; - sdt->header->checksum -= acpi_calc_checksum(sdt->aml, sdt->aml_len); - break; + memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ + memset(fadt_aml + 40, 0, 4); /* sanitize DSDT ptr */ + if (fadt_aml[8 /* FADT Major Version */] >= 3) { + memset(fadt_aml + 132, 0, 8); /* sanitize X_FIRMWARE_CTRL ptr */ + memset(fadt_aml + 140, 0, 8); /* sanitize X_DSDT ptr */ } + + /* update checksum */ + fadt_aml[9 /* Checksum */] = 0; + fadt_aml[9 /* Checksum */] -= acpi_calc_checksum(fadt_aml, fadt_len); } static void dump_aml_files(test_data *data, bool rebuild) @@ -537,8 +519,6 @@ static void test_acpi_one(const char *params, test_data *data) test_acpi_rsdt_table(data); test_acpi_fadt_table(data); - sanitize_fadt_ptrs(data); - if (iasl) { if (getenv(ACPI_REBUILD_EXPECTED_AML)) { dump_aml_files(data, true); -- 2.7.4