Commit eb7d1f17 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/highbank: don't make sysram 'nomigrate' 



Currently we use memory_region_init_ram_nomigrate() to create
the "highbank.sysram" memory region, and we don't manually
register it with vmstate_register_ram(). This currently
means that its contents are migrated but as a ram block
whose name is the empty string; in future it may mean they
are not migrated at all. Use memory_region_init_ram() instead.

Note that this is a cross-version migration compatibility
break for the "highbank" and "midway" machines.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 20180420124835.7268-2-peter.maydell@linaro.org
parent b901a172

hw/arm/highbank.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    memory_region_add_subregion(sysmem, 0, dram);



    sysram = g_new(MemoryRegion, 1);

    memory_region_init_ram_nomigrate(sysram, NULL, "highbank.sysram", 0x8000,

    memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000,

                           &error_fatal);

    memory_region_add_subregion(sysmem, 0xfff88000, sysram);

    if (bios_name != NULL) {