From: Philippe Mathieu-Daudé Date: Sun, 18 Aug 2019 22:54:13 +0000 (+0200) Subject: hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_* X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=367607f9132e97614e7da0e6a45576c51e9db68c;p=qemu.git hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_* Now that the pc_build_feature_control_file() function has been refactored to not depend of PC specific types, rename it to a more generic name. Suggested-by: Samuel Ortiz Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190818225414.22590-15-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 438c48506f..9446596a52 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1623,8 +1623,8 @@ void pc_cpus_init(PCMachineState *pcms) } } -static void pc_build_feature_control_file(MachineState *ms, - FWCfgState *fw_cfg) +static void fw_cfg_build_feature_control(MachineState *ms, + FWCfgState *fw_cfg) { X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu); CPUX86State *env = &cpu->env; @@ -1695,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(MACHINE(pcms), pcms->fw_cfg); + fw_cfg_build_feature_control(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); }