From nobody Mon Feb 9 12:26:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556809740; cv=none; d=zoho.com; s=zohoarc; b=bbc4U5h3ZaIuDWgsFYhMMRMe7foWorfVdySJ434GXZ/Kxj39D42QM73QplioHm3bgCeWaWdrTs9rlr9ChXdqpGu+Kuxey3D6Up7pSKEigI7Qn1d9Z0RDci8SpIxPH+hXSkamQ85Vw4BR7f4hRiFdXb9r4NYZBiibD6hkGmrawyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556809740; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UrrkdUOWiTVXtcywDVr2u/TTU9lv5HQj0ExLBatjEVQ=; b=MQxybb5h+vvSLPTpLUdX381NjtNjzi1sOX2ocE97+qv4H9otzSxdVXQSKWjmDVQfIV3Jml8PKWi6gfLpX5bJHClIFyuYzYOn7X7g75XuomRM7HzpFIKEGUP7ZZCb+xmuvfi4UC4nwXfhd+diMqRei+7RvSXAmKxyGN9IGNOr0yU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556809740072510.2052469302138; Thu, 2 May 2019 08:09:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:52778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMDKP-0001vd-Vx for importer@patchew.org; Thu, 02 May 2019 11:08:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD42-0004yY-J2 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:51:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD41-0002ij-77 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:51:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47236) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD40-0002iP-VQ for qemu-devel@nongnu.org; Thu, 02 May 2019 10:51:57 -0400 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 2D5BB307D962; Thu, 2 May 2019 14:51:56 +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 D2F4B71C80; Thu, 2 May 2019 14:51:46 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:51:50 +0200 Message-Id: <1556808723-226478-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1556808723-226478-1-git-send-email-imammedo@redhat.com> References: <1556808723-226478-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.48]); Thu, 02 May 2019 14:51:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 02/15] tests: acpi: make acpi_fetch_table() take size of fetched table pointer 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: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Laszlo Ersek , linuxarm@huawei.com, Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , xuwei5@huawei.com, xuwei5@hisilicon.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" Currently acpi_fetch_table() assumes 32 bit size of table pointer in ACPI tables. However X_foo variants are 64 bit, prepare acpi_fetch_table() to handle both by adding an argument for addr_ptr pointed entry size. Follow up commits will use that to read XSDT and X_foo entries in ACPI tables. Signed-off-by: Igor Mammedov Reviewed-by: Wei Yang --- tests/acpi-utils.h | 2 +- tests/acpi-utils.c | 10 ++++++---- tests/bios-tables-test.c | 8 ++++---- tests/vmgenid-test.c | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index 4cd5553..92285b7 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -49,7 +49,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts); uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table); void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_t= able); void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len, - const uint8_t *addr_ptr, const char *sig, + const uint8_t *addr_ptr, int addr_size, const char *= sig, bool verify_checksum); =20 #endif /* TEST_ACPI_UTILS_H */ diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index 633d8f5..644c87b 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -91,13 +91,15 @@ void acpi_fetch_rsdp_table(QTestState *qts, uint32_t ad= dr, uint8_t *rsdp_table) * actual one. */ void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len, - const uint8_t *addr_ptr, const char *sig, + const uint8_t *addr_ptr, int addr_size, const char *= sig, bool verify_checksum) { - uint32_t addr, len; + uint32_t len; + uint64_t addr =3D 0; =20 - memcpy(&addr, addr_ptr , sizeof(addr)); - addr =3D le32_to_cpu(addr); + g_assert(addr_size =3D=3D 4 || addr_size =3D=3D 8); + memcpy(&addr, addr_ptr , addr_size); + addr =3D le64_to_cpu(addr); qtest_memread(qts, addr + 4, &len, 4); /* Length of ACPI table */ *aml_len =3D le32_to_cpu(len); *aml =3D g_malloc0(*aml_len); diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 6a678bf..86b592c 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -114,14 +114,14 @@ static void test_acpi_rsdt_table(test_data *data) =20 /* read RSDT table */ acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len, - &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true= ); + &data->rsdp_table[16 /* RsdtAddress */], 4, "RSDT", t= rue); =20 /* Load all tables and add to test list directly RSDT referenced table= s */ ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size *= /) { AcpiSdtTable ssdt_table =3D {}; =20 acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, = ent, - NULL, true); + 4, NULL, true); /* Add table to ASL test tables list */ g_array_append_val(data->tables, ssdt_table); } @@ -139,11 +139,11 @@ static void test_acpi_fadt_table(test_data *data) =20 /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */ acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false); + fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false); g_array_append_val(data->tables, table); =20 acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, "DSDT", true); + fadt_aml + 40 /* DSDT */, 4, "DSDT", true); g_array_append_val(data->tables, table); =20 memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c index f400184..85d8e64 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -42,12 +42,12 @@ static uint32_t acpi_find_vgia(QTestState *qts) =20 acpi_fetch_rsdp_table(qts, rsdp_offset, rsdp_table); acpi_fetch_table(qts, &rsdt, &rsdt_len, &rsdp_table[16 /* RsdtAddress = */], - "RSDT", true); + 4, "RSDT", true); =20 ACPI_FOREACH_RSDT_ENTRY(rsdt, rsdt_len, ent, 4 /* Entry size */) { uint8_t *table_aml; =20 - acpi_fetch_table(qts, &table_aml, &table_length, ent, NULL, true); + acpi_fetch_table(qts, &table_aml, &table_length, ent, 4, NULL, tru= e); if (!memcmp(table_aml + 16 /* OEM Table ID */, "VMGENID", 7)) { uint32_t vgia_val; uint8_t *aml =3D &table_aml[36 /* AML byte-code start */]; --=20 2.7.4