diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-26 11:04:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-26 11:04:39 +0100 |
| commit | eb7d1f176381466660a730f14eff3d521686aa31 (patch) | |
| tree | 132c6c997b05952f809a0ef3560a36dafbe8a13c /hw/arm/highbank.c | |
| parent | b901a172455cfbb96cc36e916ebc65f0bfed8109 (diff) | |
| download | qemu-eb7d1f176381466660a730f14eff3d521686aa31.zip qemu-eb7d1f176381466660a730f14eff3d521686aa31.tar.gz qemu-eb7d1f176381466660a730f14eff3d521686aa31.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20180420124835.7268-2-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/highbank.c')
| -rw-r--r-- | hw/arm/highbank.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 1742cf6..88326d1 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -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) { |