On Fri, Mar 7, 2025 at 8:46 PM Philippe Mathieu-Daudé <phi...@linaro.org> wrote:
>
> Replace the compile-time CONFIG_ACPI check by a runtime one.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Reviewed-by: Ani Sinha <anisi...@redhat.com>
> ---
> hw/i386/fw_cfg.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
> index d08aefa0291..a7f1b60b98c 100644
> --- a/hw/i386/fw_cfg.c
> +++ b/hw/i386/fw_cfg.c
> @@ -145,10 +145,10 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms,
> */
> fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, apic_id_limit);
> fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size);
> -#ifdef CONFIG_ACPI
> - fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES,
> - acpi_tables, acpi_tables_len);
> -#endif
> + if (acpi_builtin()) {
> + fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES,
> + acpi_tables, acpi_tables_len);
> + }
> fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, 1);
>
> fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_fw_cfg, sizeof(hpet_fw_cfg));
> --
> 2.47.1
>
