On 8/22/2025 8:12 PM, Mark Cave-Ayland wrote:
> Now that we can guarantee the i440fx-pc machine will always have a PCI bus, any
> instances of rom_memory can be replaced by pci_memory and rom_memory removed
> completely.
>
> Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
> ---
> hw/i386/pc_piix.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 5babdc3e4c..b736f0f236 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -113,7 +113,6 @@ static void pc_init1(MachineState *machine, const char *pci_type)
> GSIState *gsi_state;
> MemoryRegion *ram_memory;
> MemoryRegion *pci_memory = NULL;
> - MemoryRegion *rom_memory = system_memory;
> ram_addr_t lowmem;
> uint64_t hole64_size = 0;
> PCIDevice *pci_dev;
> @@ -191,7 +190,6 @@ static void pc_init1(MachineState *machine, const char *pci_type)
>
> pci_memory = g_new(MemoryRegion, 1);
> memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
> - rom_memory = pci_memory;
>
> phb = OBJECT(qdev_new(TYPE_I440FX_PCI_HOST_BRIDGE));
> object_property_add_child(OBJECT(machine), "i440fx", phb);
> @@ -222,7 +220,7 @@ static void pc_init1(MachineState *machine, const char *pci_type)
>
> /* allocate ram and load rom/bios */
> if (!xen_enabled()) {
> - pc_memory_init(pcms, system_memory, rom_memory, hole64_size);
> + pc_memory_init(pcms, system_memory, pci_memory, hole64_size);
> } else {
> assert(machine->ram_size == x86ms->below_4g_mem_size +
> x86ms->above_4g_mem_size);