diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-02-13 13:01:49 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-02-20 20:34:21 +0300 |
| commit | a4ed7a7b763bd9d82b1e9c5e8c24938a69284504 (patch) | |
| tree | fb9db271e108c2c7f86e1d031c05256cc642da01 | |
| parent | b9212a57f57f637ee6d25208d961e3c90c97ef98 (diff) | |
| download | qemu-a4ed7a7b763bd9d82b1e9c5e8c24938a69284504.zip qemu-a4ed7a7b763bd9d82b1e9c5e8c24938a69284504.tar.gz qemu-a4ed7a7b763bd9d82b1e9c5e8c24938a69284504.tar.bz2 | |
hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h'
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é <philmd@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Luc Michel <luc.michel@amd.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | hw/i386/acpi-common.c | 1 | ||||
| -rw-r--r-- | hw/i386/acpi-common.h | 3 | ||||
| -rw-r--r-- | 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 43dc23f..f1a11f8 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 b3c56ee..e305aaa 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 c0e6c43..d7c7f93 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); |