| Message ID | 20180604110358.2821-3-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 917b77f5e5a713c217ecc962fd8c491aa9b586aa |
| Headers | show |
| Series | mips boston/malta: don't have nomigrate RAM regions | expand |
On 06/04/2018 01:03 PM, Peter Maydell wrote: > Currently we use memory_region_init_rom_nomigrate() to create > the "bios.1fc" 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 "malta" machine. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/mips/mips_malta.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index af70ecffc0..927944899b 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1153,7 +1153,7 @@ void mips_malta_init(MachineState *machine) > * handled by an overlapping region as the resulting ROM code subpage > * regions are not executable. > */ > - memory_region_init_ram_nomigrate(bios_copy, NULL, "bios.1fc", BIOS_SIZE, > + memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE, > &error_fatal); > if (!rom_copy(memory_region_get_ram_ptr(bios_copy), > FLASH_ADDRESS, BIOS_SIZE)) { >
On 06/04/2018 08:03 AM, Peter Maydell wrote: > Currently we use memory_region_init_rom_nomigrate() to create > the "bios.1fc" 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 "malta" machine. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/mips/mips_malta.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index af70ecffc0..927944899b 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1153,7 +1153,7 @@ void mips_malta_init(MachineState *machine) > * handled by an overlapping region as the resulting ROM code subpage > * regions are not executable. > */ > - memory_region_init_ram_nomigrate(bios_copy, NULL, "bios.1fc", BIOS_SIZE, > + memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE, > &error_fatal); > if (!rom_copy(memory_region_get_ram_ptr(bios_copy), > FLASH_ADDRESS, BIOS_SIZE)) { >
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index af70ecffc0..927944899b 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1153,7 +1153,7 @@ void mips_malta_init(MachineState *machine) * handled by an overlapping region as the resulting ROM code subpage * regions are not executable. */ - memory_region_init_ram_nomigrate(bios_copy, NULL, "bios.1fc", BIOS_SIZE, + memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE, &error_fatal); if (!rom_copy(memory_region_get_ram_ptr(bios_copy), FLASH_ADDRESS, BIOS_SIZE)) {
Currently we use memory_region_init_rom_nomigrate() to create the "bios.1fc" 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 "malta" machine. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/mips/mips_malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1