pc: Remove PcGuestInfo.isapc_ram_fw field
The code can use the PCMachineClass.pci_enabled field directly. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
parent
5299f1c70a
commit
5db3f0deaf
|
@ -1365,7 +1365,7 @@ void pc_memory_init(PCMachineState *pcms,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize PC system firmware */
|
/* 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));
|
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
|
||||||
memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
|
memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
|
||||||
|
|
|
@ -85,7 +85,6 @@ static void pc_init1(MachineState *machine,
|
||||||
MemoryRegion *ram_memory;
|
MemoryRegion *ram_memory;
|
||||||
MemoryRegion *pci_memory;
|
MemoryRegion *pci_memory;
|
||||||
MemoryRegion *rom_memory;
|
MemoryRegion *rom_memory;
|
||||||
PcGuestInfo *guest_info;
|
|
||||||
ram_addr_t lowmem;
|
ram_addr_t lowmem;
|
||||||
|
|
||||||
/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory).
|
/* 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;
|
rom_memory = system_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
guest_info = pc_guest_info_init(pcms);
|
pc_guest_info_init(pcms);
|
||||||
|
|
||||||
guest_info->isapc_ram_fw = !pcmc->pci_enabled;
|
|
||||||
|
|
||||||
if (pcmc->smbios_defaults) {
|
if (pcmc->smbios_defaults) {
|
||||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
|
|
|
@ -71,7 +71,6 @@ static void pc_q35_init(MachineState *machine)
|
||||||
int i;
|
int i;
|
||||||
ICH9LPCState *ich9_lpc;
|
ICH9LPCState *ich9_lpc;
|
||||||
PCIDevice *ahci;
|
PCIDevice *ahci;
|
||||||
PcGuestInfo *guest_info;
|
|
||||||
ram_addr_t lowmem;
|
ram_addr_t lowmem;
|
||||||
DriveInfo *hd[MAX_SATA_PORTS];
|
DriveInfo *hd[MAX_SATA_PORTS];
|
||||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
|
@ -134,8 +133,7 @@ static void pc_q35_init(MachineState *machine)
|
||||||
rom_memory = get_system_memory();
|
rom_memory = get_system_memory();
|
||||||
}
|
}
|
||||||
|
|
||||||
guest_info = pc_guest_info_init(pcms);
|
pc_guest_info_init(pcms);
|
||||||
guest_info->isapc_ram_fw = false;
|
|
||||||
|
|
||||||
if (pcmc->smbios_defaults) {
|
if (pcmc->smbios_defaults) {
|
||||||
/* These values are guest ABI, do not change */
|
/* These values are guest ABI, do not change */
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
|
|
||||||
/* Machine info for ACPI build: */
|
/* Machine info for ACPI build: */
|
||||||
struct PcGuestInfo {
|
struct PcGuestInfo {
|
||||||
bool isapc_ram_fw;
|
|
||||||
unsigned apic_id_limit;
|
unsigned apic_id_limit;
|
||||||
bool apic_xrupt_override;
|
bool apic_xrupt_override;
|
||||||
uint64_t numa_nodes;
|
uint64_t numa_nodes;
|
||||||
|
|
Loading…
Reference in a new issue