From patchwork Wed Jun 27 18:29:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Markovic X-Patchwork-Id: 140378 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1229740ljj; Wed, 27 Jun 2018 11:34:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfTbOvVL8GFAQQHHqdHATXj7iLK6/8v6V4/cr8/vVgIWOTnH+mU9KFez2wLvCyKlVHTcA30 X-Received: by 2002:ac8:409b:: with SMTP id p27-v6mr6276383qtl.94.1530124487802; Wed, 27 Jun 2018 11:34:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530124487; cv=none; d=google.com; s=arc-20160816; b=WOlUlruoDjRPVNVxrfqiOiQhtMG8Zjch+xpqCwBMKUpvfYiTY7qGrxfDFYY7dEjdHV zBYIRfThpEEgqUhGFz1HiTv8nuYGhEAjvxKY3UNCmIqUz7R2+WXlKrxSCeJfvWp5qQEN nGWoRHvJyvHA0ehCtzMavi1UPVnUBVhgaR8bF4aS91+k7Id8tRjjPWzu2wOpL9lJfNQi dcEF9AwmNNNtILDDiHWxOmeWPfpk3KgXc/ddpsZp775y+OjQvFrfMtGS59g6kS1PQAH6 /neM2tfwzTklUs1vRubjNEDwrgmoXpBCmkIZUM8GAHICwGhNBy3+rgaWtITqvGA2JqFs vJ9w== 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=asgAnvUw/xnAP4W5SEaFwfPJ5NzjXl8bJPEi7MHgfqQ=; b=PSTzQdFLJ8ncvl6KarskUUri9mGxKESfZHe7iOdCStJCqk7o/LUa+syaoosZBqG1rT YvvMiwavxVNiLxbQ7WdOJx4cQKzPBUw6WjmJpQ9XDPZXE3f3g9oUbFGQ63ZoO1nReQUz xbSCY+wV3lLcnQCM74PfmljARKYJT/h3hcKWP6ZjOfDvu9Tb61Ywj2kVi88fTrhd5AZW v8FWio+ty6urctQoKpJqhch3uj/UYZBYHH0Vy5BZVXWjibucxRcXgqFhXMWMWZAzgN1u 1VwC2cIwwJ1bOgTU5P6OP9H5o2HZfuQucsr4nLzHBQ0yvdyAZx4+IiFLsY7CRe57pJ/C +r8w== 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 g7-v6si3518081qvj.177.2018.06.27.11.34.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Jun 2018 11:34:47 -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]:60870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYFHD-0001NF-6W for patch@linaro.org; Wed, 27 Jun 2018 14:34:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYFCI-0007L0-Ql 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-0000kU-Eg for qemu-devel@nongnu.org; Wed, 27 Jun 2018 14:29:42 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:47439 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 1fYFCE-00008G-Vw 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 8C0DB1A211E; 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 60AE81A1FDA; Wed, 27 Jun 2018 20:29:14 +0200 (CEST) From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 27 Jun 2018 20:29:03 +0200 Message-Id: <1530124149-3900-4-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 3/9] hw/mips/mips_malta: don't make bios 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 "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 Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Paul Burton Signed-off-by: Aleksandar Markovic --- hw/mips/mips_malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 494f84e..b9d92bf 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1152,7 +1152,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)) {