[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 08/15] hw/i386/pc: Let fw_cfg_init() use the
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v3 08/15] hw/i386/pc: Let fw_cfg_init() use the generic MachineState |
Date: |
Mon, 1 Jul 2019 21:56:18 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 |
On 7/1/19 6:01 PM, Christophe de Dinechin wrote:
> Philippe Mathieu-Daudé writes:
>
>> We removed the PCMachineState access, we can now let the fw_cfg_init()
>> function to take a generic MachineState object.
>
> to take -> take
>
>>
>> Suggested-by: Samuel Ortiz <address@hidden>
>> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>> ---
>> hw/i386/pc.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
>> index 1e856704e1..60ee71924a 100644
>> --- a/hw/i386/pc.c
>> +++ b/hw/i386/pc.c
>> @@ -929,7 +929,7 @@ static void pc_build_smbios(PCMachineState *pcms)
>> }
>> }
>>
>> -static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms,
>> +static FWCfgState *fw_cfg_arch_create(MachineState *ms,
>
> I don't see where ms is used in the function. Maybe in a later patch,
> I did not receive patches 09-15 yet.
You are right, it is not used (even if the following patches).
>> const CPUArchIdList *cpus,
>> uint16_t boot_cpus,
>> uint16_t apic_id_limit)
>> @@ -1667,6 +1667,7 @@ void pc_memory_init(PCMachineState *pcms,
>> MemoryRegion *ram_below_4g, *ram_above_4g;
>> FWCfgState *fw_cfg;
>> MachineState *machine = MACHINE(pcms);
>> + MachineClass *mc = MACHINE_GET_CLASS(machine);
>> PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
>>
>> assert(machine->ram_size == pcms->below_4g_mem_size +
>> @@ -1763,7 +1764,7 @@ void pc_memory_init(PCMachineState *pcms,
>> option_rom_mr,
>> 1);
>>
>> - fw_cfg = fw_cfg_arch_create(pcms, mc->possible_cpu_arch_ids(machine),
>> + fw_cfg = fw_cfg_arch_create(machine, mc->possible_cpu_arch_ids(machine),
>> pcms->boot_cpus, pcms->apic_id_limit);
>>
>> rom_set_fw(fw_cfg);
- [Qemu-devel] [PATCH v3 00/15] hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 01/15] hw/i386/pc: Use e820_get_num_entries() to access e820_entries, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 03/15] hw/i386/pc: Use address_space_memory in place, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 02/15] hw/i386/pc: Extract e820 memory layout code, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 04/15] hw/i386/pc: Rename bochs_bios_init as more generic fw_cfg_arch_create, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 05/15] hw/i386/pc: Pass the boot_cpus value by argument, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 06/15] hw/i386/pc: Pass the apic_id_limit value by argument, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 07/15] hw/i386/pc: Pass the CPUArchIdList array by argument, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 08/15] hw/i386/pc: Let fw_cfg_init() use the generic MachineState, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 09/15] hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 10/15] hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 11/15] hw/i386/pc: Rename pc_build_smbios() as generic fw_cfg_build_smbios(), Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 12/15] hw/i386/pc: Let pc_build_feature_control() take a FWCfgState argument, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 13/15] hw/i386/pc: Let pc_build_feature_control() take a MachineState argument, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 14/15] hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_*, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH v3 15/15] hw/i386/pc: Extract the x86 generic fw_cfg code, Philippe Mathieu-Daudé, 2019/07/01