From patchwork Wed Jun 27 18:29:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Markovic X-Patchwork-Id: 140379 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1231172ljj; Wed, 27 Jun 2018 11:36:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf/EoeQt5D15DBZjPPA4vtH7MRUcqiysd5t1dva/ei10DdrXO7yoxEdUzIujVtHV1Xw8brj X-Received: by 2002:a37:7742:: with SMTP id s63-v6mr6012140qkc.97.1530124570621; Wed, 27 Jun 2018 11:36:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530124570; cv=none; d=google.com; s=arc-20160816; b=ejsCqTMpSLdRNEGugb85PaY5bClu5ICLG1KrZcaV3CHqnOXrl9hz346OG4oZzlLIy1 nEu4mUnWVosvVDL8D8sM4kjQb4MXq9Kqmk4EbMthNd0Tj0r1dLFyJdJiWOF/tamVqcL3 AnhC0BQ9SGCvZpXzJ/pynHMfB8AqqodkkFl50tgEwuTPRI0Whwitz9pTKrar8F+u+bzi C1jOV4rLh7kS2ker55spW95t1W0y5itK/3t1ewA4cehJEOe7H16P5ctmnEF31NdevgLH DfXLkE8AC/Gph3pLcyX9JqH9D+XIil0bVFtws/uMZYeUYgYa3Klr3QBqYb56FHwcAYTD Yj9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=flHlpRlc3kPS2mZIqwkyJpurw3k3MexluyzkCi6euQ0=; b=PCzkLBh/TY111iZQzK0YxgMC7Y7AAXNj80OJ2jJW2oLpPvw7UOnAX1r/jMfh1aGmrA IpN8M9P37m8axP6xV8tYSpRFvxgQyR1IoyG1RAYNjXmvJO2wJtywFpVMuv9gCaZ3TPVI 9ae7iGgnotIkrxMi/HrFJpkguufcIvzw3dqKnJA2AqQ5NwaMSOILqjcBvLWQEV/HK4xu 5XT6mrpbO4+572/cfoGSR/dulgWRpW7EQtbd1X6JbUdNIJiEpb+CiVub8ITG9NEcoU2+ ZbIAepb4z0ynZK57vcNC/jGEPEDg0z5ewH0c80TJQgZIxFWtRhixKaaxH06QVQavjLo+ t/cA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x10-v6si4417525qkl.294.2018.06.27.11.36.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Jun 2018 11:36:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:60875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYFIY-0002VR-2w for patch@linaro.org; Wed, 27 Jun 2018 14:36:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYFCI-0007Ks-Pv for qemu-devel@nongnu.org; Wed, 27 Jun 2018 14:29:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYFCF-0000kx-GP for qemu-devel@nongnu.org; Wed, 27 Jun 2018 14:29:42 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:47438 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fYFCF-00008B-1E for qemu-devel@nongnu.org; Wed, 27 Jun 2018 14:29:39 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 7CA871A1DDB; Wed, 27 Jun 2018 20:29:14 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 59C411A1FB3; Wed, 27 Jun 2018 20:29:14 +0200 (CEST) From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 27 Jun 2018 20:29:02 +0200 Message-Id: <1530124149-3900-3-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530124149-3900-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1530124149-3900-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PULL v2 2/9] hw/mips/boston: don't make flash region 'nomigrate' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Paul Burton Signed-off-by: Aleksandar Markovic --- hw/mips/boston.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.7.4 diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 52cce19..14e6f95 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);