SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/i386/pc_{q35,piix}: Minimize usage of get_system_memory()

Browse Source 
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230213162004.2797-6-shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bernhard Beschow 2023-02-13 17:20:00 +01:00 committed by Michael S. Tsirkin
parent 1e366da031
commit 8631743c09
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/pc_piix.c
View File

@ -242,7 +242,7 @@ static void pc_init1(MachineState *machine,
isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0")); isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
} else { } else {
pci_bus = NULL; pci_bus = NULL;
isa_bus = isa_bus_new(NULL, get_system_memory(), system_io, isa_bus = isa_bus_new(NULL, system_memory, system_io,
&error_abort); &error_abort);
i8257_dma_init(isa_bus, 0); i8257_dma_init(isa_bus, 0);
pcms->hpet_enabled = false; pcms->hpet_enabled = false;

7
hw/i386/pc_q35.c
View File

@ -126,6 +126,7 @@ static void pc_q35_init(MachineState *machine)
DeviceState *lpc_dev; DeviceState *lpc_dev;
BusState *idebus[MAX_SATA_PORTS]; BusState *idebus[MAX_SATA_PORTS];
ISADevice *rtc_state; ISADevice *rtc_state;
MemoryRegion *system_memory = get_system_memory();
MemoryRegion *system_io = get_system_io(); MemoryRegion *system_io = get_system_io();
MemoryRegion *pci_memory; MemoryRegion *pci_memory;
MemoryRegion *rom_memory; MemoryRegion *rom_memory;
@ -192,7 +193,7 @@ static void pc_q35_init(MachineState *machine)
rom_memory = pci_memory; rom_memory = pci_memory;
} else { } else {
pci_memory = NULL; pci_memory = NULL;
rom_memory = get_system_memory(); rom_memory = system_memory;
} }
pc_guest_info_init(pcms); pc_guest_info_init(pcms);
@ -215,7 +216,7 @@ static void pc_q35_init(MachineState *machine)
} }
/* allocate ram and load rom/bios */ /* allocate ram and load rom/bios */
pc_memory_init(pcms, get_system_memory(), rom_memory, &ram_memory, pc_memory_init(pcms, system_memory, rom_memory, &ram_memory,
pci_hole64_size); pci_hole64_size);
object_property_add_child(OBJECT(machine), "q35", OBJECT(q35_host)); object_property_add_child(OBJECT(machine), "q35", OBJECT(q35_host));
@ -224,7 +225,7 @@ static void pc_q35_init(MachineState *machine)
object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_PCI_MEM, object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_PCI_MEM,
OBJECT(pci_memory), NULL); OBJECT(pci_memory), NULL);
object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_SYSTEM_MEM, object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_SYSTEM_MEM,
OBJECT(get_system_memory()), NULL); OBJECT(system_memory), NULL);
object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_IO_MEM, object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_IO_MEM,
OBJECT(system_io), NULL); OBJECT(system_io), NULL);
object_property_set_int(OBJECT(q35_host), PCI_HOST_BELOW_4G_MEM_SIZE, object_property_set_int(OBJECT(q35_host), PCI_HOST_BELOW_4G_MEM_SIZE,