From patchwork Thu Feb 22 11:25:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774852 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716094wrw; Thu, 22 Feb 2024 03:30:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXxwMKqY+d4tikPxSgb4N9HHZGxAk5UPhpoTAZ680msNrLeuYzMkzRUGvWHpMZNNJs59/nq5b78x2hClvpM1NSq X-Google-Smtp-Source: AGHT+IErIr7gfx2r0EuN/g/HL1NpDpkZLXSMp4k1VrKSCxb0fstkjeuc9A8GwWJ1K9t9de/+ApFq X-Received: by 2002:a05:620a:56e:b0:787:31f0:b516 with SMTP id p14-20020a05620a056e00b0078731f0b516mr21875906qkp.10.1708601452206; Thu, 22 Feb 2024 03:30:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601452; cv=none; d=google.com; s=arc-20160816; b=Ib6JruTBM+xBkSve9TlhkpfvYAl02waphWZ2L04H16sVPEoYcSeoKGmtBJ9MfEccgj bpEePo1oHHbWDvzSSm34GLMFVfRfucGncPSO/g7eyr/4z3MNR0n1uYtCzIUpSbpW8qEx 4y84DWvvTCzlCBPRhQl890wFTUQB2CmCxQj+gcg3y868YXU/U1hwlmVTGJSZ6cJcCXUx /N0ca6rhxUHuvRLbg2DP6sIgCbSi3XjRksUk1xquniMSWmxkcV2aa+Fnx32hZi35P2bQ B0RiGbZ6LsVujafpY7O38+IHsBzXGV8tALJPO5xXR/apeq4aWb+csDup1go5pELtHphs e8cg== 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; bh=MP6vEj38dSTwOAKkjZv/ydNnV29A52FqD+K71WPESsQ=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=sofaeQs7Vt2f92B6F/JOeYcZ7LJQUAI9Z8uPp9NwLSlfYS0dUl4YYKzpuDfLGENJ1M fh6Atj3HDNx4sy/IOcKoz5JtoQ8/5uDpXbqGVbAmxKI47HtCPpX1kK2UmxfxbR7u6VVh sNPRLqNFo6cZ++4qhT19gBGrhGjGWnp3RzTQacynFO86d59UMtZPakI2rKr4hTdAFZAg n8mi1HgvH3hDT7Kg9pZv/Z9AwOCPHIAt79bdizW9cxcsXGpxpA+fjgavfahY/M/Qoe4z TgNn293AjA0WyxnMz7T2X5pM3sM/ZS/s4J32Ut/g75/wgYkBsYDdxXY2A8apJ6JeNZEr 6Wvw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x27-20020a05620a099b00b0078753d43ec8si11656036qkx.50.2024.02.22.03.30.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:30:52 -0800 (PST) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rd7E3-0008A3-4K; Thu, 22 Feb 2024 06:26:51 -0500 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 1rd7Dm-00086E-Pu; Thu, 22 Feb 2024 06:26:36 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rd7Dk-0004x1-8N; Thu, 22 Feb 2024 06:26:33 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D74564FB4A; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 5DEE387176; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526164 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 08/34] hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h' Date: Thu, 22 Feb 2024 14:25:35 +0300 Message-Id: <20240222112601.2526057-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé Since pc_madt_cpu_entry() is only used by: - hw/i386/acpi-build.c // single call - hw/i386/acpi-common.c // definition there is no need to expose it outside of hw/i386/. Declare it in "acpi-common.h". acpi-build.c doesn't need "hw/i386/pc.h" anymore. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/i386/acpi-common.c | 1 - hw/i386/acpi-common.h | 3 +++ include/hw/i386/pc.h | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 43dc23f7e0..f1a11f833a 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -27,7 +27,6 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" -#include "hw/i386/pc.h" #include "target/i386/cpu.h" #include "acpi-build.h" diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index b3c56ee014..e305aaac15 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -1,12 +1,15 @@ #ifndef HW_I386_ACPI_COMMON_H #define HW_I386_ACPI_COMMON_H +#include "hw/boards.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/i386/x86.h" /* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled); void acpi_build_madt(GArray *table_data, BIOSLinker *linker, X86MachineState *x86ms, const char *oem_id, const char *oem_table_id); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c0e6c43fbd..d7c7f930ed 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -199,10 +199,6 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, int *data_len); void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); -/* hw/i386/acpi-common.c */ -void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, - GArray *entry, bool force_enabled); - /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms);