Commit 5934e216 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
parent 9ebeed0c

hw/i386/pc.c

+5 −6
Original line number Diff line number Diff line
@@ -1276,12 +1276,12 @@ FWCfgState *xen_load_linux(PCMachineState *pcms, 
    return fw_cfg;

}



FWCfgState *pc_memory_init(PCMachineState *pcms,

void pc_memory_init(PCMachineState *pcms,

                    MemoryRegion *system_memory,

                    MemoryRegion *rom_memory,

                           MemoryRegion **ram_memory,

                           PcGuestInfo *guest_info)

                    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)

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,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);

hw/i386/pc_q35.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,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 */

include/hw/i386/pc.h

+4 −5
Original line number Diff line number Diff line
@@ -250,11 +250,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,

void pc_memory_init(PCMachineState *pcms,

                    MemoryRegion *system_memory,

                    MemoryRegion *rom_memory,

                           MemoryRegion **ram_memory,

                           PcGuestInfo *guest_info);

                    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,