From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPncR-0003WB-6y for qemu-devel@nongnu.org; Mon, 04 Jun 2018 07:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPncQ-0003HN-Df for qemu-devel@nongnu.org; Mon, 04 Jun 2018 07:25:47 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:42538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fPncQ-0003Gn-5n for qemu-devel@nongnu.org; Mon, 04 Jun 2018 07:25:46 -0400 From: Peter Maydell Date: Mon, 4 Jun 2018 12:03:57 +0100 Message-Id: <20180604110358.2821-2-peter.maydell@linaro.org> In-Reply-To: <20180604110358.2821-1-peter.maydell@linaro.org> References: <20180604110358.2821-1-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/2] hw/mips/boston: don't make flash region 'nomigrate' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paul Burton , Aurelien Jarno , Yongbok Kim , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Juan Quintela , dgilbert@redhat.com Currently we use memory_region_init_rom_nomigrate() to create the "boston.flash" 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 "boston" machine. Signed-off-by: Peter Maydell --- hw/mips/boston.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 5302e5c885..1d136529ad 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -471,8 +471,7 @@ static void boston_mach_init(MachineState *machine) sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1); flash = g_new(MemoryRegion, 1); - memory_region_init_rom_nomigrate(flash, NULL, - "boston.flash", 128 * M_BYTE, &err); + memory_region_init_rom(flash, NULL, "boston.flash", 128 * M_BYTE, &err); memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); ddr = g_new(MemoryRegion, 1); -- 2.17.1