From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPncS-0003Wz-5S for qemu-devel@nongnu.org; Mon, 04 Jun 2018 07:25:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPncR-0003Ht-B2 for qemu-devel@nongnu.org; Mon, 04 Jun 2018 07:25:48 -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 1fPncR-0003Gn-4P for qemu-devel@nongnu.org; Mon, 04 Jun 2018 07:25:47 -0400 From: Peter Maydell Date: Mon, 4 Jun 2018 12:03:58 +0100 Message-Id: <20180604110358.2821-3-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 2/2] hw/mips/mips_malta: don't make bios 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 "bios.1fc" 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 "malta" machine. Signed-off-by: Peter Maydell --- hw/mips/mips_malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index af70ecffc0..927944899b 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1153,7 +1153,7 @@ void mips_malta_init(MachineState *machine) * handled by an overlapping region as the resulting ROM code subpage * regions are not executable. */ - memory_region_init_ram_nomigrate(bios_copy, NULL, "bios.1fc", BIOS_SIZE, + memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE, &error_fatal); if (!rom_copy(memory_region_get_ram_ptr(bios_copy), FLASH_ADDRESS, BIOS_SIZE)) { -- 2.17.1