From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2B2FC433EF for ; Tue, 5 Oct 2021 16:29:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CBDA61373 for ; Tue, 5 Oct 2021 16:29:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5CBDA61373 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:50040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXnJu-0007ft-IZ for qemu-devel@archiver.kernel.org; Tue, 05 Oct 2021 12:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXmtB-0000bl-9d for qemu-devel@nongnu.org; Tue, 05 Oct 2021 12:01:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXmt8-0005KE-Do for qemu-devel@nongnu.org; Tue, 05 Oct 2021 12:01:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633449713; 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: in-reply-to:in-reply-to:references:references; bh=qwecV/HMx7pl/yc/ZHCbGktA++haMiU72fN1swDGVcY=; b=EVKs1MrRCkJZTkhqBYBfsndEnVHydREsp3ZZ6Xb2SE2y+Ih6+GGAnhftOmMOsEazNWzVXY fKxSt19aBBnmfm7GfNrJiIPdGZNkTbBbsnKGL62rUvbCnyqs8SdOShJTP2vxjKMxz6o3QM iPjFh0JI2J2NdGh42JNNXmJdg+Hg8kA= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-72DnoAGaMSGKtcXnxVqbqA-1; Tue, 05 Oct 2021 12:01:52 -0400 X-MC-Unique: 72DnoAGaMSGKtcXnxVqbqA-1 Received: by mail-wm1-f70.google.com with SMTP id d7-20020a1c7307000000b0030d6982305bso1494340wmb.5 for ; Tue, 05 Oct 2021 09:01:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=qwecV/HMx7pl/yc/ZHCbGktA++haMiU72fN1swDGVcY=; b=o0YwHn7ygEGNkKc/u9eHGYA2L8WtohmYXrbZz9VrrUlx8MrPTqS/vix2tQyXvbOxBL Wyxc+XCkXdlgP0UE+fspZ+YNipg2aKkmaM/R2qqWBSaM3sbxzjjtbcSrZmg+6DxXTKhM SJ4hLCm2k4AhilKDJdU/iSxWz0A+Df5rAys0OeTIAD57XTuEiEwiGpjdmHYhhmsdh625 pBFwJ/ZOpCaAtgbM9HosQ6UhmUXjXraRSfCNCG5NwHgveyxRFTpPdwSm6jDx0rqDRDXo 5CTLIzfaExCgolZ0yel0gzdGMbUi0o0VyVSt3xe9E86Ct77tcKpT/t+UDXl/2bvS4Iy2 Y+ug== X-Gm-Message-State: AOAM532XCKed2aIsXyzuyELDWgIsJK6WjQBSKDF50l/GnLSdbDZdmIdd OCRnRVkaUmCElHpSOYJFhetIBbV/XGeLAfq8E8Tk/AyMH7X16Av9FtmHN7UNJj5icZ+MgOOd07b mHjNIOsmrfh7aSSwuVCW8tLKsZnQzU02gjKcw2KtdruAzE3I+CGBD3xbimruP X-Received: by 2002:a5d:4882:: with SMTP id g2mr22007270wrq.399.1633449711052; Tue, 05 Oct 2021 09:01:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwl+pMZbU+3YxTrmZOrbZYSaDMqD8wRrEE+YUJ6ciLZbQkxXbdlP0xeOplbdLItGXfnrS9zGQ== X-Received: by 2002:a5d:4882:: with SMTP id g2mr22007234wrq.399.1633449710821; Tue, 05 Oct 2021 09:01:50 -0700 (PDT) Received: from redhat.com ([2.55.147.134]) by smtp.gmail.com with ESMTPSA id r26sm2294835wmh.35.2021.10.05.09.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 09:01:50 -0700 (PDT) Date: Tue, 5 Oct 2021 12:01:47 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 18/57] acpi: build_slit: use acpi_table_begin()/acpi_table_end() instead of build_header() Message-ID: <20211005155946.513818-19-mst@redhat.com> References: <20211005155946.513818-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211005155946.513818-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.066, 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: Ani Sinha , Peter Maydell , Eric Auger , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Igor Mammedov 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 Reviewed-by: Eric Auger Message-Id: <20210924122802.1455362-5-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/acpi/aml-build.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 86b8322ee1..ec870f53ba 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1958,11 +1958,12 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, const char *oem_id, const char *oem_table_id) { - int slit_start, i, j; - slit_start = table_data->len; + int i, j; int nb_numa_nodes = ms->numa_state->num_nodes; + AcpiTable table = { .sig = "SLIT", .rev = 1, + .oem_id = oem_id, .oem_table_id = oem_table_id }; - acpi_data_push(table_data, sizeof(AcpiTableHeader)); + acpi_table_begin(&table, table_data); build_append_int_noprefix(table_data, nb_numa_nodes, 8); for (i = 0; i < nb_numa_nodes; i++) { @@ -1973,11 +1974,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, 1); } } - - build_header(linker, table_data, - (void *)(table_data->data + slit_start), - "SLIT", - table_data->len - slit_start, 1, oem_id, oem_table_id); + acpi_table_end(linker, &table); } /* build rev1/rev3/rev5.1 FADT */ -- MST