Commit 6a3a2e82 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

hppa: drop usage of memory_region_allocate_system_memory() for ROM 



machine_hppa_init() violates memory_region_allocate_system_memory() contract
by calling it multiple times which could break with -mem-path. Replace
the second usage (for 'rom') with memory_region_init_ram() instead.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <20191008113318.7012-4-imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 2def24f1

hw/hppa/machine.c

+2 −3
Original line number Diff line number Diff line
@@ -161,9 +161,8 @@ static void machine_hppa_init(MachineState *machine) 
    g_free(firmware_filename);



    rom_region = g_new(MemoryRegion, 1);

    memory_region_allocate_system_memory(rom_region, OBJECT(machine),

                                         "firmware",

                                         (FIRMWARE_END - FIRMWARE_START));

    memory_region_init_ram(rom_region, NULL, "firmware",

                           (FIRMWARE_END - FIRMWARE_START), &error_fatal);

    memory_region_add_subregion(addr_space, FIRMWARE_START, rom_region);



    /* Load kernel */