| Message ID | 20190524063553.5339-10-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> 于2019年5月24日周五 下午2:46写道： > The bochs_bios_init() is not restricted to the Bochs BIOS and is > useful to other BIOS. Rename it to be more generic. > > Suggested-by: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/i386/pc.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index a3936bb29d..264074489b 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -928,7 +928,7 @@ static void pc_build_smbios(PCMachineState *pcms) > } > } > > -static FWCfgState *bochs_bios_init(PCMachineState *pcms) > +static FWCfgState *x86_create_fw_cfg(PCMachineState *pcms) > { > FWCfgState *fw_cfg; > uint64_t *numa_fw_cfg; > @@ -1508,7 +1508,7 @@ void pc_cpus_init(PCMachineState *pcms) > * Limit for the APIC ID value, so that all > * 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 > x86_create_fw_cfg(). > */ > pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1; > possible_cpus = mc->possible_cpu_arch_ids(ms); > @@ -1762,7 +1762,7 @@ void pc_memory_init(PCMachineState *pcms, > option_rom_mr, > 1); > > - fw_cfg = bochs_bios_init(pcms); > + fw_cfg = x86_create_fw_cfg(pcms); > > rom_set_fw(fw_cfg); > > -- > 2.20.1 > > >
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a3936bb29d..264074489b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -928,7 +928,7 @@ static void pc_build_smbios(PCMachineState *pcms) } } -static FWCfgState *bochs_bios_init(PCMachineState *pcms) +static FWCfgState *x86_create_fw_cfg(PCMachineState *pcms) { FWCfgState *fw_cfg; uint64_t *numa_fw_cfg; @@ -1508,7 +1508,7 @@ void pc_cpus_init(PCMachineState *pcms) * Limit for the APIC ID value, so that all * 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 x86_create_fw_cfg(). */ pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1; possible_cpus = mc->possible_cpu_arch_ids(ms); @@ -1762,7 +1762,7 @@ void pc_memory_init(PCMachineState *pcms, option_rom_mr, 1); - fw_cfg = bochs_bios_init(pcms); + fw_cfg = x86_create_fw_cfg(pcms); rom_set_fw(fw_cfg);
The bochs_bios_init() is not restricted to the Bochs BIOS and is useful to other BIOS. Rename it to be more generic. Suggested-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/i386/pc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)