[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/9] hw/i386/pc_{q35, piix}: Minimize usage of get_system_memo
From: |
Bernhard Beschow |
Subject: |
[PATCH v3 5/9] hw/i386/pc_{q35, piix}: Minimize usage of get_system_memory() |
Date: |
Sat, 4 Feb 2023 16:10:23 +0100 |
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index ee9d9a4175..5bde4533cc 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -241,7 +241,7 @@ static void pc_init1(MachineState *machine,
isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
} else {
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);
i8257_dma_init(isa_bus, 0);
pcms->hpet_enabled = false;
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 71b7a30bb9..8253b49296 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -125,6 +125,7 @@ static void pc_q35_init(MachineState *machine)
DeviceState *lpc_dev;
BusState *idebus[MAX_SATA_PORTS];
ISADevice *rtc_state;
+ MemoryRegion *system_memory = get_system_memory();
MemoryRegion *system_io = get_system_io();
MemoryRegion *pci_memory;
MemoryRegion *rom_memory;
@@ -192,7 +193,7 @@ static void pc_q35_init(MachineState *machine)
rom_memory = pci_memory;
} else {
pci_memory = NULL;
- rom_memory = get_system_memory();
+ rom_memory = system_memory;
}
pc_guest_info_init(pcms);
@@ -215,7 +216,7 @@ static void pc_q35_init(MachineState *machine)
}
/* 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);
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(pci_memory), NULL);
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(system_io), NULL);
object_property_set_int(OBJECT(q35_host), PCI_HOST_BELOW_4G_MEM_SIZE,
--
2.39.1
- [PATCH v3 0/9] PC cleanups, Bernhard Beschow, 2023/02/04
- [PATCH v3 1/9] hw/pci-host/i440fx: Inline sysbus_add_io(), Bernhard Beschow, 2023/02/04
- [PATCH v3 2/9] hw/pci-host/q35: Inline sysbus_add_io(), Bernhard Beschow, 2023/02/04
- [PATCH v3 3/9] hw/i386/pc_q35: Reuse machine parameter, Bernhard Beschow, 2023/02/04
- [PATCH v3 4/9] hw/i386/pc_{q35, piix}: Reuse MachineClass::desc as SMB product name, Bernhard Beschow, 2023/02/04
- [PATCH v3 5/9] hw/i386/pc_{q35, piix}: Minimize usage of get_system_memory(),
Bernhard Beschow <=
- [PATCH v3 6/9] hw/i386/pc: Initialize ram_memory variable directly, Bernhard Beschow, 2023/02/04
- [PATCH v3 7/9] hw/pci-host/pam: Make init_pam() usage more readable, Bernhard Beschow, 2023/02/04
- [PATCH v3 9/9] target/i386/tcg/sysemu/tcg-cpu: Avoid own opinion about smram size, Bernhard Beschow, 2023/02/04
- [PATCH v3 8/9] hw/i386/x86: Make TYPE_X86_MACHINE the owner of smram, Bernhard Beschow, 2023/02/04