From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1rZrW8-0007fn-8V for mharc-qemu-trivial@gnu.org; Tue, 13 Feb 2024 07:04:04 -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 1rZrUc-0005V5-4o for qemu-trivial@nongnu.org; Tue, 13 Feb 2024 07:02:41 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUW-00018L-00 for qemu-trivial@nongnu.org; Tue, 13 Feb 2024 07:02:28 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33b28aadb28so2690825f8f.3 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=1707825740; x=1708430540; 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=xSchSPfuPY2n1EkQHouSHk4YbFHxg+Db65z9J9BsnUzIeuXD8ap2oa94ZHFsLSa+WX p+uBgRnJ3Gb2NvjA4Ysr0SXIOVZsn09f4cT+D1dx6TGyI3/zzbMcenyYIzLWlA5f5jhH a7IVkrZShbTF5OwXt4aUMQ/tJsaJkB4LYjaqrUD+oqs3FyXmOvgZuKkqzJfN7yWPLkW6 1qP/p3MhTRM+RTQAMNJ52CKnKKr/uFv0LFpvPinfPl7bFT6y6BiYigFO7jFaP+ekHnfs 5SouxkyUA74GQcVECNhbknoyzQBzbu/mhqTBOPsHjFCAbwFHHiNzRzzYaGI88GOFuiwR yJqQ== 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=ZA+ZypB61EHvGMk5zd04PzY9FzTpleu/8NYhcpz03ofOvu3Gt5nM8zfs5DwjBs0RW8 2rvDgqguL30fCJULl5y6fGXFv7PMXOfV8rXkUlbNL9Wlz4CTHyfl5Sy/cqp8YWnEcQvF yzzn6C8Cy18Z/EyeKgN3hXVfVKREdI6VFRMnVn9s8fx2jJop/RNVn3pcfaFG1++rd86z bXuZ27NYGBl7WTY9FWRPh2nL2u44KgmcPBLH+U5RVizuSEqmkIYLPM3SBuOf4h7dguN5 60qYRFa8eoLziLw3POWaoNz841InLn+A3O4rxpOb/1g75lLNUwc8QAB8/8giANzsfeR5 9T4Q== X-Forwarded-Encrypted: i=1; AJvYcCUNkrMkyS+4x9BpZVEq9Jn+Nr7I9mJKo5cNK+OgmFvsxjFZTRUEaUSJzzKjJgI0d9vw3EVzVDAydwBfzd1c4AX4kOHFjvj5mw== X-Gm-Message-State: AOJu0Yz2byiZwfT8nOKVoNTr+/+fd6zgkZ/8s5XIZ+DV+gjIjIgAXc1l /0Y7k4jBUEXQlFHVjGW0rcOZ9kviVu4UsN8+7Pj8dcWurRUK38SqSyz+m+7K/HA= X-Google-Smtp-Source: AGHT+IGAQCiDsIxeY1VWXFGXt44SCk2WBSDXytr/c1oFpUbBy8hwOMhYnPd951f+JsXeRt0+qDqJvg== 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=20Mathieu-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=20Mathieu-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2024 12:02:49 -0000 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" -- 2.41.0