Commit 4e91c7f3 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

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: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190818225414.22590-14-philmd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent eb6449fb

hw/i386/pc.c

+2 −3
Original line number Diff line number Diff line
@@ -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)

{

    MachineState *ms = MACHINE(pcms);

    X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu);

    CPUX86State *env = &cpu->env;

    uint32_t unused, ecx, edx;
@@ -1696,7 +1695,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, pcms->fw_cfg);

        pc_build_feature_control_file(MACHINE(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);

    }