From nobody Mon Feb 9 16:38:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631026188; cv=none; d=zohomail.com; s=zohoarc; b=KYnJ1qS89X/pDdCGkJEZsnZ2ECICcxszlAar4WEbVcTxbBxM++X7DxA201lpLkwcgpaBK+RAmN4oMt7XWsuOZuHQno93HKCUi1+u2DJwb14uxDvstml6rS1484EFREflEcpIFZiEdr1nQgC4hUruCGh8kSfOm3l/LTVCPpHRHpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631026188; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JKQWh5/vVJkJbNzi44G3xbbZxdpIGyhnwoVw23faxvg=; b=b0Lujcp7gw3Jiqlhej8l6l5Q3YjNco8vcBLr8O1812wJLVpOil+ZCrvSIys/kZ8ZZAM/spCEZKRo+1ndbZR5TqsDAPDruVHizNePS6/mfHkRNMay4rIHbtYCcyRgkyXgwOW4e5tDk627ctFUYW2V+a8yGST4GCs01FxH42zB1n8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631026188488524.7863117997606; Tue, 7 Sep 2021 07:49:48 -0700 (PDT) Received: from localhost ([::1]:50186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNcPz-0008Ni-BX for importer@patchew.org; Tue, 07 Sep 2021 10:49:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNcOm-0005n6-BV for qemu-devel@nongnu.org; Tue, 07 Sep 2021 10:48:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNcOk-000888-Mx for qemu-devel@nongnu.org; Tue, 07 Sep 2021 10:48:32 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-pwQ6AEtRNuOjsqbe5KEJ1A-1; Tue, 07 Sep 2021 10:48:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40F93107ACE4 for ; Tue, 7 Sep 2021 14:48:28 +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 96EBE5D9CA; Tue, 7 Sep 2021 14:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631026110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JKQWh5/vVJkJbNzi44G3xbbZxdpIGyhnwoVw23faxvg=; b=JLuzf6oPWzmJIsiwiVFek6HIJj7ne78Y93JSzqxejsP/LvBwZiQpfZ76UDA6G4SoGMZ13Q YNe/n8oIBB5hWScbMkAxgdBberL5JSAKo5FHeXJRr8N1PA7sulsKWmXLiKoiN9LSOiog5+ 59uwBHRJFd8mDYoB48iC3W/Rr9qRsL0= X-MC-Unique: pwQ6AEtRNuOjsqbe5KEJ1A-1 From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v3 03/35] acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of build_header() Date: Tue, 7 Sep 2021 10:47:42 -0400 Message-Id: <20210907144814.741785-4-imammedo@redhat.com> In-Reply-To: <20210907144814.741785-1-imammedo@redhat.com> References: <20210907144814.741785-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.391, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631026189714100001 Content-Type: text/plain; charset="utf-8" it replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation, which hides offsets magic from API user. While at it switch to build_append_int_noprefix() to build entries to other tables (which also removes some manual offset calculations). Signed-off-by: Igor Mammedov Reviewed-by: Eric Auger --- v3: * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/ --- include/hw/acpi/acpi-defs.h | 10 ---------- hw/acpi/aml-build.c | 27 ++++++++++++--------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index ccfa3382aa..f6d2ca172b 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection { typedef struct AcpiSerialPortConsoleRedirection AcpiSerialPortConsoleRedirection; =20 -/* - * ACPI 2.0 eXtended System Description Table (XSDT) - */ -struct AcpiXsdtDescriptorRev2 { - ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint64_t table_offset_entry[]; /* Array of pointers to other */ - /* ACPI tables */ -} QEMU_PACKED; -typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2; - /* * ACPI 1.0 Firmware ACPI Control Structure (FACS) */ diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 32f14d4a78..daefc132f3 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1916,27 +1916,24 @@ build_xsdt(GArray *table_data, BIOSLinker *linker, = GArray *table_offsets, const char *oem_id, const char *oem_table_id) { int i; - unsigned xsdt_entries_offset; - AcpiXsdtDescriptorRev2 *xsdt; - int xsdt_start =3D table_data->len; - const unsigned table_data_len =3D (sizeof(uint64_t) * table_offsets->l= en); - const unsigned xsdt_entry_size =3D sizeof(xsdt->table_offset_entry[0]); - const size_t xsdt_len =3D sizeof(*xsdt) + table_data_len; - - xsdt =3D acpi_data_push(table_data, xsdt_len); - xsdt_entries_offset =3D (char *)xsdt->table_offset_entry - table_data-= >data; + AcpiTable table =3D { .sig =3D "XSDT", .rev =3D 1, + .oem_id =3D oem_id, .oem_table_id =3D oem_table_id= }; + + acpi_table_begin(&table, table_data); + for (i =3D 0; i < table_offsets->len; ++i) { uint64_t ref_tbl_offset =3D g_array_index(table_offsets, uint32_t,= i); - uint64_t xsdt_entry_offset =3D xsdt_entries_offset + xsdt_entry_si= ze * i; + uint64_t xsdt_entry_offset =3D table.array->len; =20 - /* xsdt->table_offset_entry to be filled by Guest linker */ + /* reserve space for entry */ + build_append_int_noprefix(table.array, 0, 8); + + /* mark position of RSDT entry to be filled by Guest linker */ bios_linker_loader_add_pointer(linker, - ACPI_BUILD_TABLE_FILE, xsdt_entry_offset, xsdt_entry_size, + ACPI_BUILD_TABLE_FILE, xsdt_entry_offset, 8, ACPI_BUILD_TABLE_FILE, ref_tbl_offset); } - build_header(linker, table_data, - (void *)(table_data->data + xsdt_start), - "XSDT", xsdt_len, 1, oem_id, oem_table_id); + acpi_table_end(linker, &table); } =20 void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, --=20 2.27.0