diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-04 12:03:57 +0100 |
|---|---|---|
| committer | Aleksandar Markovic <amarkovic@wavecomp.com> | 2018-06-27 20:10:54 +0200 |
| commit | 9581eeebe3ffd37f7fde270f92c96a2c5ebb860c (patch) | |
| tree | 9bb9f52de1559e8ad6b728ae03f65b04ccb18fce | |
| parent | c92023bfd18c968d615b715522467f7354db5877 (diff) | |
| download | qemu-9581eeebe3ffd37f7fde270f92c96a2c5ebb860c.zip qemu-9581eeebe3ffd37f7fde270f92c96a2c5ebb860c.tar.gz qemu-9581eeebe3ffd37f7fde270f92c96a2c5ebb860c.tar.bz2 | |
hw/mips/boston: don't make flash region 'nomigrate'
Currently we use memory_region_init_rom_nomigrate() to create
the "boston.flash" 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 a cross-version migration compatibility break
for the "boston" machine.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Signed-off-by: Aleksandar Markovic <aleksandar.markovic@mips.com>
| -rw-r--r-- | hw/mips/boston.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 52cce19..14e6f95 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -471,8 +471,7 @@ static void boston_mach_init(MachineState *machine) sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1); flash = g_new(MemoryRegion, 1); - memory_region_init_rom_nomigrate(flash, NULL, - "boston.flash", 128 * M_BYTE, &err); + memory_region_init_rom(flash, NULL, "boston.flash", 128 * M_BYTE, &err); memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); ddr = g_new(MemoryRegion, 1); |