openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/i386/pc: Let pc_build_feature_control() take a MachineState argument 

Let the pc_build_feature_control_file() function take a generic MachineState
argument.

Suggested-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190818225414.22590-14-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-08-19 00:54:12 +02:00 committed by Paolo Bonzini
parent eb6449fbd8
commit 4e91c7f32e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/i386/pc.c
View File

@ -1623,10 +1623,9 @@ void pc_cpus_init(PCMachineState *pcms)
} }
} }
static void pc_build_feature_control_file(PCMachineState *pcms, static void pc_build_feature_control_file(MachineState *ms,
FWCfgState *fw_cfg) FWCfgState *fw_cfg)
{ {
MachineState *ms = MACHINE(pcms);
X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu); X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu);
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
uint32_t unused, ecx, edx; uint32_t unused, ecx, edx;
@ -1696,7 +1695,7 @@ void pc_machine_done(Notifier *notifier, void *data)
acpi_setup(); acpi_setup();
if (pcms->fw_cfg) { if (pcms->fw_cfg) {
fw_cfg_build_smbios(MACHINE(pcms), pcms->fw_cfg); fw_cfg_build_smbios(MACHINE(pcms), pcms->fw_cfg);
pc_build_feature_control_file(pcms, pcms->fw_cfg); pc_build_feature_control_file(MACHINE(pcms), pcms->fw_cfg);
/* update FW_CFG_NB_CPUS to account for -device added CPUs */ /* update FW_CFG_NB_CPUS to account for -device added CPUs */
fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus); fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);
} }