提交 5888e01c 编写于 作者: P Philippe Mathieu-Daudé 提交者: Paolo Bonzini

hw/i386/pc: Rename bochs_bios_init as more generic fw_cfg_arch_create

The bochs_bios_init() function is not restricted to the Bochs
BIOS and is useful to other BIOS.
Since it is not specific to the PC machine, and can be reused
by other machines of the X86 architecture, rename it as
fw_cfg_arch_create().
Suggested-by: NSamuel Ortiz <sameo@linux.intel.com>
Reviewed-by: NLi Qiang <liq3ea@gmail.com>
Signed-off-by: NPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190818225414.22590-5-philmd@redhat.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 0f432b30
...@@ -936,7 +936,7 @@ static void pc_build_smbios(PCMachineState *pcms) ...@@ -936,7 +936,7 @@ static void pc_build_smbios(PCMachineState *pcms)
} }
} }
static FWCfgState *bochs_bios_init(PCMachineState *pcms) static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms)
{ {
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
uint64_t *numa_fw_cfg; uint64_t *numa_fw_cfg;
...@@ -1614,7 +1614,7 @@ void pc_cpus_init(PCMachineState *pcms) ...@@ -1614,7 +1614,7 @@ void pc_cpus_init(PCMachineState *pcms)
* Limit for the APIC ID value, so that all * Limit for the APIC ID value, so that all
* CPU APIC IDs are < pcms->apic_id_limit. * CPU APIC IDs are < pcms->apic_id_limit.
* *
* This is used for FW_CFG_MAX_CPUS. See comments on bochs_bios_init(). * This is used for FW_CFG_MAX_CPUS. See comments on fw_cfg_arch_create().
*/ */
pcms->apic_id_limit = x86_cpu_apic_id_from_index(pcms, pcms->apic_id_limit = x86_cpu_apic_id_from_index(pcms,
ms->smp.max_cpus - 1) + 1; ms->smp.max_cpus - 1) + 1;
...@@ -1869,7 +1869,7 @@ void pc_memory_init(PCMachineState *pcms, ...@@ -1869,7 +1869,7 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr, option_rom_mr,
1); 1);
fw_cfg = bochs_bios_init(pcms); fw_cfg = fw_cfg_arch_create(pcms);
rom_set_fw(fw_cfg); rom_set_fw(fw_cfg);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册