[v2,05/14] pc: Simplify pc_memory_init() signature

We can get the PcGuestInfo struct directly from PCMachineState,
and the return value is not needed at all.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/i386/pc.c         | 11 +++++------
 hw/i386/pc_piix.c    |  2 +-
 hw/i386/pc_q35.c     |  2 +-
 include/hw/i386/pc.h |  9 ++++-----
 4 files changed, 11 insertions(+), 13 deletions(-)

On 12/11/2015 08:42 PM, Eduardo Habkost wrote:
> We can get the PcGuestInfo struct directly from PCMachineState,
> and the return value is not needed at all.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>   hw/i386/pc.c         | 11 +++++------
>   hw/i386/pc_piix.c    |  2 +-
>   hw/i386/pc_q35.c     |  2 +-
>   include/hw/i386/pc.h |  9 ++++-----
>   4 files changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 30cdfaf..b4c638d 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1276,12 +1276,12 @@ FWCfgState *xen_load_linux(PCMachineState *pcms,
>       return fw_cfg;
>   }
>
> -FWCfgState *pc_memory_init(PCMachineState *pcms,
> -                           MemoryRegion *system_memory,
> -                           MemoryRegion *rom_memory,
> -                           MemoryRegion **ram_memory,
> -                           PcGuestInfo *guest_info)
> +void pc_memory_init(PCMachineState *pcms,
> +                    MemoryRegion *system_memory,
> +                    MemoryRegion *rom_memory,
> +                    MemoryRegion **ram_memory)
>   {
> +    PcGuestInfo *guest_info = &pcms->acpi_guest_info;
>       int linux_boot, i;
>       MemoryRegion *ram, *option_rom_mr;
>       MemoryRegion *ram_below_4g, *ram_above_4g;
> @@ -1403,7 +1403,6 @@ FWCfgState *pc_memory_init(PCMachineState *pcms,
>           rom_add_option(option_rom[i].name, option_rom[i].bootindex);
>       }
>       guest_info->fw_cfg = fw_cfg;
> -    return fw_cfg;
>   }
>
>   qemu_irq pc_allocate_cpu_irq(void)
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 9718d7b..f7bc1c0 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -161,7 +161,7 @@ static void pc_init1(MachineState *machine,
>       /* allocate ram and load rom/bios */
>       if (!xen_enabled()) {
>           pc_memory_init(pcms, system_memory,
> -                       rom_memory, &ram_memory, guest_info);
> +                       rom_memory, &ram_memory);
>       } else if (machine->kernel_filename != NULL) {
>           /* For xen HVM direct kernel boot, load linux here */
>           xen_load_linux(pcms, guest_info);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 43ee8bb..bb1436e 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -153,7 +153,7 @@ static void pc_q35_init(MachineState *machine)
>       /* allocate ram and load rom/bios */
>       if (!xen_enabled()) {
>           pc_memory_init(pcms, get_system_memory(),
> -                       rom_memory, &ram_memory, guest_info);
> +                       rom_memory, &ram_memory);
>       }
>
>       /* irq lines */
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 74c0515..3943507 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -232,11 +232,10 @@ void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
>
>   FWCfgState *xen_load_linux(PCMachineState *pcms,
>                              PcGuestInfo *guest_info);
> -FWCfgState *pc_memory_init(PCMachineState *pcms,
> -                           MemoryRegion *system_memory,
> -                           MemoryRegion *rom_memory,
> -                           MemoryRegion **ram_memory,
> -                           PcGuestInfo *guest_info);
> +void pc_memory_init(PCMachineState *pcms,
> +                    MemoryRegion *system_memory,
> +                    MemoryRegion *rom_memory,
> +                    MemoryRegion **ram_memory);
>   qemu_irq pc_allocate_cpu_irq(void);
>   DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
>   void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
>


Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>