aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-24 17:56:12 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-24 17:59:28 +0100
commitb2d1b0507d1b80f23da12dd8aab56944fe380a09 (patch)
treeadd6c4f33eb5e450683950ef84c8dd9c4b5e6b8d
parent3d75007e017b62f2165b8c0166f0e4984bc1640d (diff)
downloadqemu-arm-b2d1b0507d1b80f23da12dd8aab56944fe380a09.tar.gz
integratorcp: Don't migrate flash using vmstate_register_ram_global()pull-target-arm-20170724
Instead of migrating the flash by creating the memory region with memory_region_init_ram_nomigrate() and then calling vmstate_register_ram_global(), just use memory_region_init_ram(), which now handles migration registration automatically. This is a migration compatibility break for the integratorcp board, because the RAM region's migration name changes to include the device path. This is OK because we don't guarantee migration compatibility for this board. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1500310341-28931-1-git-send-email-peter.maydell@linaro.org
-rw-r--r--hw/arm/integratorcp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index d79221d166..d9530edffc 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -276,9 +276,8 @@ static void integratorcm_init(Object *obj)
s->cm_init = 0x00000112;
s->cm_refcnt_offset = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), 24,
1000);
- memory_region_init_ram_nomigrate(&s->flash, obj, "integrator.flash", 0x100000,
+ memory_region_init_ram(&s->flash, obj, "integrator.flash", 0x100000,
&error_fatal);
- vmstate_register_ram_global(&s->flash);
memory_region_init_io(&s->iomem, obj, &integratorcm_ops, s,
"integratorcm", 0x00800000);