david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm/aspeed_soc: don't use vmstate_register_ram_global for SRAM

Browse Source 
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 would be a cross-version migration compatibility break
for the "palmetto-bmc", "ast2500-evb" and "romulus-bmc" machines,
but migration is currently broken for them.

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>
Message-id: 20180420124835.7268-4-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-04-26 11:04:39 +01:00
parent 44cf837d38
commit a2e9989c96
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/arm/aspeed_soc.c
View File

@ -186,13 +186,12 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
} }
/* SRAM */ /* 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); sc->info->sram_size, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;
} }
vmstate_register_ram_global(&s->sram);
memory_region_add_subregion(get_system_memory(), ASPEED_SOC_SRAM_BASE, memory_region_add_subregion(get_system_memory(), ASPEED_SOC_SRAM_BASE,
&s->sram); &s->sram);