| Message ID | 20180420124835.7268-4-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | aspeed, highbank: fix RAM migration oddities | expand |
On 04/20/2018 02:48 PM, Peter Maydell wrote: > Currently we use vmstate_register_ram_global() for the SRAM; > this is not a good idea for devices, because it means that > you can only ever create one instance of the device, as > the second instance would get a RAM block name clash. > Instead, use memory_region_init_ram(), which automatically > registers the RAM block with a local-to-the-device name. > > Note that this is a cross-version migration compatibility break > for the "palmetto-bmc", "ast2500-evb" and "romulus-bmc" machines. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Tested-by: Cédric Le Goater <clg@kaod.org> On palmetto, romulus and ast2500-evb boards Thanks C.> --- > hw/arm/aspeed_soc.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c > index 30d25f8b06..407f10d0d4 100644 > --- a/hw/arm/aspeed_soc.c > +++ b/hw/arm/aspeed_soc.c > @@ -186,13 +186,12 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) > } > > /* SRAM */ > - memory_region_init_ram_nomigrate(&s->sram, OBJECT(dev), "aspeed.sram", > + memory_region_init_ram(&s->sram, OBJECT(dev), "aspeed.sram", > sc->info->sram_size, &err); > if (err) { > error_propagate(errp, err); > return; > } > - vmstate_register_ram_global(&s->sram); > memory_region_add_subregion(get_system_memory(), ASPEED_SOC_SRAM_BASE, > &s->sram); > >
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 30d25f8b06..407f10d0d4 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -186,13 +186,12 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) } /* SRAM */ - memory_region_init_ram_nomigrate(&s->sram, OBJECT(dev), "aspeed.sram", + memory_region_init_ram(&s->sram, OBJECT(dev), "aspeed.sram", sc->info->sram_size, &err); if (err) { error_propagate(errp, err); return; } - vmstate_register_ram_global(&s->sram); memory_region_add_subregion(get_system_memory(), ASPEED_SOC_SRAM_BASE, &s->sram);
Currently we use vmstate_register_ram_global() for the SRAM; this is not a good idea for devices, because it means that you can only ever create one instance of the device, as the second instance would get a RAM block name clash. Instead, use memory_region_init_ram(), which automatically registers the RAM block with a local-to-the-device name. Note that this is a cross-version migration compatibility break for the "palmetto-bmc", "ast2500-evb" and "romulus-bmc" machines. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/arm/aspeed_soc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)