aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-07-09 14:51:35 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-09 14:51:35 +0100
commit8fad0a65582c0a6e324580f45516461e9b6aa439 (patch)
tree5fa7bf1c3d687cb75a751030a05705482630d65f
parent5bd366b467fd23d0530580573b2024d3962222c3 (diff)
downloadqemu-arm-pull-target-arm-20180709.tar.gz
hw/net/dp8393x: don't make prom region 'nomigrate'pull-target-arm-20180709
Currently we use memory_region_init_rom_nomigrate() to create the "dp3893x-prom" 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 MIPS "magnum" and "pica61" machines. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Aleksandar Markovic <aleksandar.markovic@wavecomp.com> Message-id: 20180706174309.27110-1-peter.maydell@linaro.org
-rw-r--r--hw/net/dp8393x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index f2d2ce344c..b53fcaa8bc 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -887,7 +887,7 @@ static void dp8393x_realize(DeviceState *dev, Error **errp)
s->watchdog = timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s);
s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */
- memory_region_init_ram_nomigrate(&s->prom, OBJECT(dev),
+ memory_region_init_ram(&s->prom, OBJECT(dev),
"dp8393x-prom", SONIC_PROM_SIZE, &local_err);
if (local_err) {
error_propagate(errp, local_err);