From nobody Mon Feb 9 00:42:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154446647379988.68084941910718; Mon, 10 Dec 2018 10:27:53 -0800 (PST) Received: from localhost ([::1]:34214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWQHY-00079d-8X for importer@patchew.org; Mon, 10 Dec 2018 13:27:52 -0500 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 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 69B2258E5A; Mon, 10 Dec 2018 18:20:54 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C1395C1B4; Mon, 10 Dec 2018 18:20:53 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 10 Dec 2018 18:20:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 8/9] tests: acpi: squash sanitize_fadt_ptrs() into test_acpi_fadt_table() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Samuel Ortiz , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D g_array_index(data->tables, typeof(table), 0); uint8_t *fadt_aml =3D table.aml; + uint32_t fadt_len =3D table.aml_len; =20 ACPI_ASSERT_CMP(table.header->signature, "FACP"); =20 @@ -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 =3D 0; i < data->tables->len; i++) { - AcpiSdtTable *sdt =3D &g_array_index(data->tables, AcpiSdtTable, i= ); - - if (memcmp(&sdt->header->signature, "FACP", 4)) { - continue; - } =20 - /* check original FADT checksum before sanitizing table */ - g_assert(!acpi_calc_checksum((uint8_t *)sdt->aml, sdt->aml_len)); - - /* sdt->aml field offset :=3D 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 >=3D 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 =3D 0; - sdt->header->checksum -=3D acpi_calc_checksum(sdt->aml, sdt->aml_l= en); - 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 */] >=3D 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 */] =3D 0; + fadt_aml[9 /* Checksum */] -=3D acpi_calc_checksum(fadt_aml, fadt_len); } =20 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); =20 - sanitize_fadt_ptrs(data); - if (iasl) { if (getenv(ACPI_REBUILD_EXPECTED_AML)) { dump_aml_files(data, true); --=20 2.7.4