haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
Pass the FWCfgState object by argument, this will
allow us to remove the PCMachineState argument later.

Suggested-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190818225414.22590-13-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-08-19 00:54:11 +02:00 committed by Paolo Bonzini
parent e0e949d7d8
commit eb6449fbd8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hw/i386/pc.c
View file

@ -1623,7 +1623,8 @@ void pc_cpus_init(PCMachineState *pcms)
}
}
static void pc_build_feature_control_file(PCMachineState *pcms)
static void pc_build_feature_control_file(PCMachineState *pcms,
FWCfgState *fw_cfg)
{
MachineState *ms = MACHINE(pcms);
X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu);
@ -1649,7 +1650,7 @@ static void pc_build_feature_control_file(PCMachineState *pcms)
val = g_malloc(sizeof(*val));
*val = cpu_to_le64(feature_control_bits | FEATURE_CONTROL_LOCKED);
fw_cfg_add_file(pcms->fw_cfg, "etc/msr_feature_control", val, sizeof(*val));
fw_cfg_add_file(fw_cfg, "etc/msr_feature_control", val, sizeof(*val));
}
static void rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count)
@ -1695,7 +1696,7 @@ void pc_machine_done(Notifier *notifier, void *data)
acpi_setup();
if (pcms->fw_cfg) {
fw_cfg_build_smbios(MACHINE(pcms), pcms->fw_cfg);
pc_build_feature_control_file(pcms);
pc_build_feature_control_file(pcms, pcms->fw_cfg);
/* 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);
}