[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PULL 4/4] integratorcp: Don't migrate flash using vmstate_

From: Peter Maydell
Subject: [Qemu-devel] [PULL 4/4] integratorcp: Don't migrate flash using vmstate_register_ram_global()
Date: Mon, 24 Jul 2017 18:06:18 +0100

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 <address@hidden>
Message-id: address@hidden
 hw/arm/integratorcp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index d79221d..d9530ed 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,
-    memory_region_init_ram_nomigrate(&s->flash, obj, "integrator.flash", 
+    memory_region_init_ram(&s->flash, obj, "integrator.flash", 0x100000,
-    vmstate_register_ram_global(&s->flash);
     memory_region_init_io(&s->iomem, obj, &integratorcm_ops, s,
                           "integratorcm", 0x00800000);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]