From patchwork Tue Feb 13 12:01:49 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: 772298 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp216548wre; Tue, 13 Feb 2024 04:04:58 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUTOv8Sy0X38SzxUA1sbgwiz6GCE1/GqCz0WSrY0XU4rmfIKv+FzfkaTXP0rsyExY/y8m5beXUs7ePuUxnYQSt1 X-Google-Smtp-Source: AGHT+IEiq3JiBPIhv3N+Ee04PTSAW+vAuS0aJthvO24C+LraH5FN8U0Vjd8VHcwZIH26oHu9NRgN X-Received: by 2002:ac8:7dcf:0:b0:42c:810f:5f4b with SMTP id c15-20020ac87dcf000000b0042c810f5f4bmr4109391qte.13.1707825898683; Tue, 13 Feb 2024 04:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707825898; cv=none; d=google.com; s=arc-20160816; b=bsSq4o5FUK7gHfpH0Q9lgRZ9uPn6Rd9aRXIsszaa6DFVjSVN86ccT1ldth5TbzO9kP iH4DQz2Mn/H0Ird8cP6UCl3t0W91mGNfNksrYeKJv+FxqtcAaLzfjPr0t/rgZ6LTkP5L GAjoHgLc425l53lzPdEFzHTjzTDkXP/ur7I95TYPBZ0aouKZxMrFiTBgZq4TKIJPJNE2 9l0crodIQQ4IyfMUgCCaljN4DJEgSdpXnwJ7ucNJ0IH3PZmI7RR0spPPlQosdPM5+HkL 4UtBKDqLkDwanpYjvdp0emHDoAH/TbllARC/PVL68aDjATH+4g5I1eI8rG2dhwS0FmD8 xkxw== 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=iSiHu0C9dIi1NiXQI0bkwiZLyOTky1dJTMwQJyq+dek=; fh=ZFq8OVAT6pKv7dP0GqNbAEpiR5RUDsBF7iSqWV9Jtj0=; b=ZVhlZ/x0BMKI7ZdoREGnf3IL+cisT9wWUqrM3HVSDJcXGK4pYEl2x+dRpRLduxU8Cy P34fZcWvWidR7uU6C9dOOA84ztuEjOfm4W5a8HZ9rDpURAUsgwwKfsdaJZ37tCVltLED R/zDwPH3lmmtJuWvOEoenT0uerF69Wh0ngGi433MOk8H8SKFf+ifS/PYkE/RxRwf0u/j JEJALt7m8XvcNFW8W9I1EArrkJEJ9sHdlsq/NPZPhcO8773y3WHdxr4or0QvhmGQqgnK 7g5ALvaIT2Y/pZYJEwTFyFCBTaaWMfgA+YhZ29YSc6H2uE3MxAg7hJB7TTxeePVxFNKO LgWQ==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ahliYT/r"; 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 X-Forwarded-Encrypted: i=1; AJvYcCULxojoEzMaiyKI86LLOEn8+A+o5fIb7TUPWxSaGIYOq7ZVMrDp3pLiF8j6VPvm4sqxTKg3Y8UiOfByEQ+FT4uJ Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t1-20020a05622a180100b0042c41cfd192si2942035qtc.205.2024.02.13.04.04.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Feb 2024 04:04:58 -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; dkim=pass header.i=@linaro.org header.s=google header.b="ahliYT/r"; 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 1rZrW9-0007hZ-00; Tue, 13 Feb 2024 07:04:05 -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 1rZrUt-0005YI-0l for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:49 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUg-00018N-1P for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33b4e6972f6so2268602f8f.2 for ; Tue, 13 Feb 2024 04:02:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825739; x=1708430539; 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=iSiHu0C9dIi1NiXQI0bkwiZLyOTky1dJTMwQJyq+dek=; b=ahliYT/rNp0t/q9usd10ezajfH4A+vYglkTzuz0aea03Iz5uoRBiZ+fjYeyLHoQtjh mzdh4IrM+eRL16bbTUaoaADsJV8BC3KQ6MU/Q7vOlPxbnrNr4HBkvDMRiHQrug5y8C7A vwoQNK/tsqEmsg/Ws1wtmG7aU9Zxx9SyVlyvQEcNUNuE90d5he4hy7j7lcwltFEyLE0Z H5l2fomXCrB27dFL+VbyEjqlnTW9kx9C+o0sJN75kWzPmGopwQxryzl5Pe4wql50xtGR /D9RhY8SjVo4VtCvKhMSoTBO6fJbzFLby4+smR5C6jtXrlC6E0ObkWbqL/O5YnMDvZtb vzTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825740; x=1708430540; 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=iSiHu0C9dIi1NiXQI0bkwiZLyOTky1dJTMwQJyq+dek=; b=WajWJqJNeZvfUPYRmOcc8TOgcHVbiSuHMjg5BjnkFExzsf3xeb6NGpHm8ftKnCeZ8m fPCcwhoDgekXSqqk4mcldVIi1GBvTe84WMuySpN3UgmwnPGh2/j4KYTX5jx24jZ8JUP6 eHl/mHCwLA8ExWj0+408QHfJfKZH+s2kwtmI3NBL2k4C2Av/aWNHC4LG8na7SHUUAFRA MDHg84kW2d/mKs5HSa7t8fgnY+57s2Jy3SaqLmWXgNbnSQ9vTeS0hpjZfMOpKOuItEW/ P+Ev9HcwZVD2SSG8CDjqbnCeL0XNJzWm8V93+qTnCEAWDuxj/Zs8vOKF2kqgBVgG0BWf inBA== X-Gm-Message-State: AOJu0YxZNkMNWoTLo5NyWDKcoBwKksBzG4dos8MTdlm0L2dESe020Bta ovb6XNagAtnOuR/hkocRd73cVsIF8xZzctGCniBT7ECrJ+45uax+fSUpUKNwF5LkSHLqVegybiA 4 X-Received: by 2002:a05:6000:1acb:b0:33a:eb5b:f8cd with SMTP id i11-20020a0560001acb00b0033aeb5bf8cdmr8971657wry.7.1707825739759; Tue, 13 Feb 2024 04:02:19 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXIpLe52WvVWm13e8JKcSmsu8NeWvHMYrrVrNdWwmz4zloLQ/wedUmFH/AqALXCWvRRkkxHKXrrB6nXXCnv2t2ntTfMXShtBL+D/VEpNHiNZCpf6jwwE8zETAxSC4j1j+Xgobk1cB6AKs8tH90dH3gqHkgz1bNJhHL+sViOOm5HfSlWI05eKDlid7GzTpfUbDDfkB8d/JxzOYX8lGZh0Nd6pv1RVBxDMsLwhet1/G2xyiR7gL7lHxbTpJ8iI2t4QAZ3pnFCIGZOS7o4StFtKyaztW7IPLP4yEsKI0ussmmYenDxmOOdpme9XX0czfLl/W9BxQZl4fc= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id x10-20020adfcc0a000000b0033cd1959681sm1816333wrh.112.2024.02.13.04.02.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Richard Henderson , Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , Marcel Apfelbaum , Bernhard Beschow , Ani Sinha , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/7] hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h' Date: Tue, 13 Feb 2024 13:01:49 +0100 Message-ID: <20240213120153.90930-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240213120153.90930-1-philmd@linaro.org> References: <20240213120153.90930-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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 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é --- hw/i386/acpi-common.h | 3 +++ include/hw/i386/pc.h | 4 ---- hw/i386/acpi-common.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) 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 f9fc42c2be..ce442372ac 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); 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"