Commit 5db3f0de authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pc: Remove PcGuestInfo.isapc_ram_fw field 



The code can use the PCMachineClass.pci_enabled field directly.

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 5299f1c7

hw/i386/pc.c

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



    /* Initialize PC system firmware */

    pc_system_firmware_init(rom_memory, guest_info->isapc_ram_fw);

    pc_system_firmware_init(rom_memory, !pcmc->pci_enabled);



    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_piix.c

+1 −4
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ static void pc_init1(MachineState *machine, 
    MemoryRegion *ram_memory;

    MemoryRegion *pci_memory;

    MemoryRegion *rom_memory;

    PcGuestInfo *guest_info;

    ram_addr_t lowmem;



    /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory).
@@ -141,9 +140,7 @@ static void pc_init1(MachineState *machine, 
        rom_memory = system_memory;

    }



    guest_info = pc_guest_info_init(pcms);



    guest_info->isapc_ram_fw = !pcmc->pci_enabled;

    pc_guest_info_init(pcms);



    if (pcmc->smbios_defaults) {

        MachineClass *mc = MACHINE_GET_CLASS(machine);

hw/i386/pc_q35.c

+1 −3
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ static void pc_q35_init(MachineState *machine) 
    int i;

    ICH9LPCState *ich9_lpc;

    PCIDevice *ahci;

    PcGuestInfo *guest_info;

    ram_addr_t lowmem;

    DriveInfo *hd[MAX_SATA_PORTS];

    MachineClass *mc = MACHINE_GET_CLASS(machine);
@@ -134,8 +133,7 @@ static void pc_q35_init(MachineState *machine) 
        rom_memory = get_system_memory();

    }



    guest_info = pc_guest_info_init(pcms);

    guest_info->isapc_ram_fw = false;

    pc_guest_info_init(pcms);



    if (pcmc->smbios_defaults) {

        /* These values are guest ABI, do not change */

include/hw/i386/pc.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


/* Machine info for ACPI build: */

struct PcGuestInfo {

    bool isapc_ram_fw;

    unsigned apic_id_limit;

    bool apic_xrupt_override;

    uint64_t numa_nodes;