[1/2] hw/mips/boston: don't make flash region 'nomigrate'

Message ID 20180604110358.2821-2-peter.maydell@linaro.org
State New
Headers show
Series
  • mips boston/malta: don't have nomigrate RAM regions
Related show

Commit Message

Peter Maydell June 4, 2018, 11:03 a.m.
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>

---
 hw/mips/boston.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.17.1

Comments

Cédric Le Goater June 4, 2018, 1:21 p.m. | #1
On 06/04/2018 01:03 PM, Peter Maydell wrote:
> 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>


Thanks,

C.

> ---

>  hw/mips/boston.c | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/hw/mips/boston.c b/hw/mips/boston.c

> index 5302e5c885..1d136529ad 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);

>
Philippe Mathieu-Daudé June 4, 2018, 2:02 p.m. | #2
On 06/04/2018 08:03 AM, Peter Maydell wrote:
> 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: Philippe Mathieu-Daudé <f4bug@amsat.org>


> ---

>  hw/mips/boston.c | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/hw/mips/boston.c b/hw/mips/boston.c

> index 5302e5c885..1d136529ad 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);

>

Patch

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 5302e5c885..1d136529ad 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);