Commit 5e640a9e authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Markus Armbruster
Browse files

pc_sysfw: Pass PCMachineState to pc_system_firmware_init() 



pc_system_firmware_init() parameter @isapc_ram_fw is PCMachineState
member pci_enabled negated.  The next commit will need more of
PCMachineState.  To prepare for that, pass a PCMachineState *, and
drop the now redundant parameter @isapc_ram_fw.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-Id: <20190308131445.17502-11-armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent d6edbe91

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -1809,7 +1809,7 @@ void pc_memory_init(PCMachineState *pcms, 
    }



    /* Initialize PC system firmware */

    pc_system_firmware_init(rom_memory, !pcmc->pci_enabled);

    pc_system_firmware_init(pcms, rom_memory);



    option_rom_mr = g_malloc(sizeof(*option_rom_mr));

    memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,

hw/i386/pc_sysfw.c

+4 −1
Original line number Diff line number Diff line
@@ -231,8 +231,11 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) 
                                bios);

}



void pc_system_firmware_init(MemoryRegion *rom_memory, bool isapc_ram_fw)

void pc_system_firmware_init(PCMachineState *pcms,

                             MemoryRegion *rom_memory)

{

    PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);

    bool isapc_ram_fw = !pcmc->pci_enabled;

    DriveInfo *pflash_drv;



    pflash_drv = drive_get(IF_PFLASH, 0, 0);

include/hw/i386/pc.h

+1 −2
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ extern PCIDevice *piix4_dev; 
int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);



/* pc_sysfw.c */

void pc_system_firmware_init(MemoryRegion *rom_memory,

                             bool isapc_ram_fw);

void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);



/* acpi-build.c */

void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,