From nobody Mon Feb 9 13:37:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162576130517491.97470140524592; Thu, 8 Jul 2021 09:21:45 -0700 (PDT) Received: from localhost ([::1]:47716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1WmW-0005sd-4y for importer@patchew.org; Thu, 08 Jul 2021 12:21:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1WEt-0002Jr-1R for qemu-devel@nongnu.org; Thu, 08 Jul 2021 11:46:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1WEq-0000UK-7S for qemu-devel@nongnu.org; Thu, 08 Jul 2021 11:46:58 -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-533-H6LhLIDkMsi1lJBMcNqPTw-1; Thu, 08 Jul 2021 11:46:54 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F228362F8; Thu, 8 Jul 2021 15:46:53 +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 8E61819C66; Thu, 8 Jul 2021 15:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625759215; 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=ZPHhhHe+29fgeRP/7KvBeQeE7oo+AH97xo4z6nhfRZg=; b=g84I1S0vcj4tlX03dbwRcLrtNfwR7D7qhbn1jg7HQphTPB1sN4MVqr3UfDw88cIL2Rg9gE OE1f0zYwGXRvM30iImW98ES+YsUKKYj97BMjwi2d5aQ0wb6H+MfKRgLk8o4i80E/+TiOR+ 8Gb0x3lu/RoCcimIJBSsts4IcmYHlcM= X-MC-Unique: H6LhLIDkMsi1lJBMcNqPTw-1 From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 19/35] acpi: build_waet: use acpi_init_table()/acpi_table_composed() instead of build_header() Date: Thu, 8 Jul 2021 11:46:01 -0400 Message-Id: <20210708154617.1538485-20-imammedo@redhat.com> In-Reply-To: <20210708154617.1538485-1-imammedo@redhat.com> References: <20210708154617.1538485-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=216.205.24.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.45, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625761306943100003 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. Signed-off-by: Igor Mammedov --- CC: marcel.apfelbaum@gmail.com --- hw/i386/acpi-build.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f23250421f..0085398360 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2104,10 +2104,10 @@ static void build_waet(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) { - int waet_start =3D table_data->len; + AcpiTable table =3D { .sig =3D "WAET", .rev =3D 1, .oem_id =3D oem_id, + .oem_table_id =3D oem_table_id }; =20 - /* WAET header */ - acpi_data_push(table_data, sizeof(AcpiTableHeader)); + acpi_init_table(&table, table_data); /* * Set "ACPI PM timer good" flag. * @@ -2116,9 +2116,7 @@ build_waet(GArray *table_data, BIOSLinker *linker, co= nst char *oem_id, * Which avoids costly VMExits caused by guest re-reading it unnecessa= rily. */ build_append_int_noprefix(table_data, 1 << 1 /* ACPI PM timer good */,= 4); - - build_header(linker, table_data, (void *)(table_data->data + waet_star= t), - "WAET", table_data->len - waet_start, 1, oem_id, oem_tabl= e_id); + acpi_table_composed(linker, &table); } =20 /* --=20 2.27.0