Commit a2e9989c authored Apr 26, 2018 by Peter Maydell

hw/arm/aspeed_soc: don't use vmstate_register_ram_global for 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 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

parent 44cf837d

hw/arm/aspeed_soc.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);