[v3,08/15] hw/i386/pc: Let fw_cfg_init() use the generic MachineState
diff mbox series

Message ID 20190701133536.28946-9-philmd@redhat.com
State New
Headers show
Series
  • hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine
Related show

Commit Message

Philippe Mathieu-Daudé July 1, 2019, 1:35 p.m. UTC
We removed the PCMachineState access, we can now let the fw_cfg_init()
function to take a generic MachineState object.

Suggested-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/i386/pc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Christophe de Dinechin July 1, 2019, 4:01 p.m. UTC | #1
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 <sameo@linux.intel.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  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.

>                                        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);


--
Cheers,
Christophe de Dinechin (IRC c3d)
Philippe Mathieu-Daudé July 1, 2019, 7:56 p.m. UTC | #2
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 <sameo@linux.intel.com>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>  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);

Patch
diff mbox series

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,
                                       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);