From patchwork Thu Mar 28 15:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 783600 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp2798942wrt; Thu, 28 Mar 2024 08:56:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWE+qLWX3fh5v54f9dRLA66aXPjGZaWKC3Vl2aIfrQhC28IfhCh2ipb05gY4J2vyyaSRxc9QqKS0FsSNPznaOWT X-Google-Smtp-Source: AGHT+IGy3ml49z/SyrBcjGWjghdNXCaeIMIUufPszREon7xGT1weAtHyLM2/lO22W7c5Y/LMjMJV X-Received: by 2002:a05:620a:1709:b0:78a:3e97:4114 with SMTP id az9-20020a05620a170900b0078a3e974114mr3861144qkb.5.1711641408031; Thu, 28 Mar 2024 08:56:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711641408; cv=none; d=google.com; s=arc-20160816; b=qJad1ZF6XRTxzhvsnhnTIJFn5ekafQ/HNMFDdNSbvHnGlMgEeiahIcpL1OE/Gv6K2r b6VcAQbCfFstqq8RronVBlhlgKt8RFbtwkbivGySEqwnF8xXNtQUYESdi+mFCA26uyJC j7jnczORXCVT6naqz80GJNMestBhUKgo6nUy6tGDoKR3cxQSQPpLabgr5i3DqMUashgv 9LQR8MRLqzeEePCwhUvJW9Z3WyyQMxHydNLj95zsAIcCeVMvY2DrZJ5vqEZAbZs/t4Ea CmkZLnq9V5GQdnDVApnri71ekeyQjeJWpmj87XMzccWS7wcmZGMEDUDaAHCitOTMqHfC xZwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ckSqN94Ak/AVFv4C8DP1wel6lx7UDcBC5ZVn+IWQ+zI=; fh=UDxTSeEolXQUwGzf6K2+0ghcCN8FdfJ4W87Ih9funHA=; b=KG3RXeqJsYy6kGGMoIQCyxy40zl5U9ViL6aZRDJd40pPuMv5YJw5mQtwKMs9/XQ88e OJIHuKj4E+rwBd516f4cFhYw61jhA3WmIIHh66dWl5YEZuuyDaIxTSkDVOR4lKwltH66 7Jbghh78WxokJHSibnnnF4p9l7PJLZJFxx3pBer4r1JImsJd+jcUzlYmaPpe38fdvcqV mtlEoRuIAYxx5vKWhACwp5SF99w/oZmxi+fNATiTGtz1hdqoKpJSAR7LUf5gKVv10IfM Oy0EkEdBJ3CPmsDrqi7FHtJcjg8FNKUhGc9IkPmwLkbDnUXLiqLQ7eAGjjV5PfxztiAO wneQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qUWjQLo8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ya21-20020a05620a5e5500b00789df5b001esi1726785qkn.543.2024.03.28.08.56.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Mar 2024 08:56:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qUWjQLo8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rps6R-0002Xx-Fc; Thu, 28 Mar 2024 11:55:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rps6Q-0002RP-I3 for qemu-devel@nongnu.org; Thu, 28 Mar 2024 11:55:42 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rps6O-0002GM-VP for qemu-devel@nongnu.org; Thu, 28 Mar 2024 11:55:42 -0400 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-56845954ffeso1750088a12.2 for ; Thu, 28 Mar 2024 08:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711641339; x=1712246139; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ckSqN94Ak/AVFv4C8DP1wel6lx7UDcBC5ZVn+IWQ+zI=; b=qUWjQLo8W+8Iepc3M0ub/a013BFffUS/zAYZt/PbK1FR3GskA+3/XlDJEa2Ahy1J16 2KchJ4Bug1C/uS/J2dIXrnmm0um6EzmMtU32hJpGsXezEWVDP4JioyMTsN+Quceqt27E A0IlTGfIAGsBMu/u+Rq2hQxYk5vhEeTUcmM+gSFJ47FnZThZAkHh7TQbwIwKqS52Z87l KEJm5jo7eX0kloZPs9QU5Y39+ZUBfz/D11pk2G7y9zzkx+8quq4F8F3MuRqpDZSmWOZ8 KWp6bMvnOyUvsFBAYN7YAazF02CwDFGevdwY3vjcvu8nj2gHtTq2lYhPcUuAmVNN+bje nTVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711641339; x=1712246139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ckSqN94Ak/AVFv4C8DP1wel6lx7UDcBC5ZVn+IWQ+zI=; b=VQnwhSiazY66jk2ccAAndoVg55fkmKM7UIAfNjkAVFXx9i0yMj3SiQ6h100VDBX23W L9BnhGqmHRjthPXk+lDcP/QYUbINtwkqk+AKzD7e1uDrDxOuDtfm0YzmmF/p9uvFCj9V 4BtZdGNd7NltuhB/RxjaM/picDgiYUKWY9XtgISYXyeIpscPiQlRCqUVmFLKQKWLAQae iCVz73uBGlhkW1LSCju436FzYwFrcWwcroigZxQ+28rfIFcPUD+hhQN1J9K7rXaIVwaN 0Gps2lp2F+X6+vhXRfFicC7481LbTuLZq4L9FjgiNAi9zgFdaIhkrcreMrkJ7W+TxpMx x7Nw== X-Gm-Message-State: AOJu0YzXJ7uTfb9ExHbFCH8d77Om1bGvjn3+4Dlgfh2lZTVpTqaZACrK E9+7T9HsjVeJmOdLaxmsVUFV+qIYqKfxtFkohT8kOqTZ0Db83kzdpVdear/nkRkkVMzcaEOa4VF s X-Received: by 2002:a17:906:494f:b0:a47:4fed:514a with SMTP id f15-20020a170906494f00b00a474fed514amr1839620ejt.52.1711641339277; Thu, 28 Mar 2024 08:55:39 -0700 (PDT) Received: from m1x-phil.lan (pas38-h02-176-184-5-52.dsl.sta.abo.bbox.fr. [176.184.5.52]) by smtp.gmail.com with ESMTPSA id j15-20020a170906254f00b00a473362062fsm894249ejb.220.2024.03.28.08.55.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 28 Mar 2024 08:55:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Eduardo Habkost , Stefano Stabellini , xen-devel@lists.xenproject.org, Bernhard Beschow , Thomas Huth , Marcel Apfelbaum , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov , Anthony Perard , Ani Sinha , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [RFC PATCH-for-9.1 09/29] hw/i386/pc: Pass PCMachineState argument to acpi_setup() Date: Thu, 28 Mar 2024 16:54:17 +0100 Message-ID: <20240328155439.58719-10-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240328155439.58719-1-philmd@linaro.org> References: <20240328155439.58719-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=philmd@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org acpi_setup() caller knows about the machine state, so pass it as argument to avoid a qdev_get_machine() call. We already resolved X86_MACHINE(pcms) as 'x86ms' so use the latter. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow --- hw/i386/acpi-build.h | 3 ++- hw/i386/acpi-build.c | 5 ++--- hw/i386/pc.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h index 0dce155c8c..31de5bddbd 100644 --- a/hw/i386/acpi-build.h +++ b/hw/i386/acpi-build.h @@ -2,6 +2,7 @@ #ifndef HW_I386_ACPI_BUILD_H #define HW_I386_ACPI_BUILD_H #include "hw/acpi/acpi-defs.h" +#include "hw/i386/pc.h" extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; @@ -9,7 +10,7 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; #define ACPI_PCIHP_SEJ_BASE 0x8 #define ACPI_PCIHP_BNMR_BASE 0x10 -void acpi_setup(void); +void acpi_setup(PCMachineState *pcms); Object *acpi_get_i386_pci_host(void); #endif diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6e8e32e5d2..e702d5e9d2 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2749,9 +2749,8 @@ static const VMStateDescription vmstate_acpi_build = { }, }; -void acpi_setup(void) +void acpi_setup(PCMachineState *pcms) { - PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); X86MachineState *x86ms = X86_MACHINE(pcms); AcpiBuildTables tables; AcpiBuildState *build_state; @@ -2771,7 +2770,7 @@ void acpi_setup(void) return; } - if (!x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) { + if (!x86_machine_is_acpi_enabled(x86ms)) { ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n"); return; } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6d87d1d4c2..dfc0247bb6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -601,7 +601,7 @@ void pc_machine_done(Notifier *notifier, void *data) /* set the number of CPUs */ x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus); - acpi_setup(); + acpi_setup(pcms); if (x86ms->fw_cfg) { fw_cfg_build_smbios(pcms, x86ms->fw_cfg, pcms->smbios_entry_point_type); fw_cfg_build_feature_control(MACHINE(pcms), x86ms->fw_cfg);