[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 13/15] hw/i386/pc: Let pc_build_feature_control()
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 13/15] hw/i386/pc: Let pc_build_feature_control() take a MachineState argument |
Date: |
Mon, 19 Aug 2019 00:54:12 +0200 |
Let the pc_build_feature_control_file() function take a generic MachineState
argument.
Suggested-by: Samuel Ortiz <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/pc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 460f55fd09..e57468a1a2 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1608,10 +1608,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;
@@ -1681,7 +1680,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);
}
--
2.20.1
- [Qemu-devel] [PATCH v4 03/15] hw/i386/pc: Use address_space_memory in place, (continued)
- [Qemu-devel] [PATCH v4 03/15] hw/i386/pc: Use address_space_memory in place, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 04/15] hw/i386/pc: Rename bochs_bios_init as more generic fw_cfg_arch_create, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 05/15] hw/i386/pc: Pass the boot_cpus value by argument, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 06/15] hw/i386/pc: Pass the apic_id_limit value by argument, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 07/15] hw/i386/pc: Pass the CPUArchIdList array by argument, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 08/15] hw/i386/pc: Remove unused PCMachineState argument in fw_cfg_arch_create, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 09/15] hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 10/15] hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 11/15] hw/i386/pc: Rename pc_build_smbios() as generic fw_cfg_build_smbios(), Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 12/15] hw/i386/pc: Let pc_build_feature_control() take a FWCfgState argument, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 13/15] hw/i386/pc: Let pc_build_feature_control() take a MachineState argument,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 14/15] hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_*, Philippe Mathieu-Daudé, 2019/08/18
- [Qemu-devel] [PATCH v4 15/15] hw/i386/pc: Extract the x86 generic fw_cfg code, Philippe Mathieu-Daudé, 2019/08/18
- Re: [Qemu-devel] [PATCH v4 00/15] hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine, Paolo Bonzini, 2019/08/22