|
@@ -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));
|