From patchwork Mon Jun 25 20:05:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Markovic X-Patchwork-Id: 139891 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4393580lji; Mon, 25 Jun 2018 13:14:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc4HYV8VCFUshHb+bE5nfnii/2S5ZU/PMuEoI9dzZTvvRsJ7G3vm6kfFU0rIjpCOlL53pA8 X-Received: by 2002:a37:ef0c:: with SMTP id j12-v6mr2744164qkk.241.1529957657224; Mon, 25 Jun 2018 13:14:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529957657; cv=none; d=google.com; s=arc-20160816; b=zwmbWhRP4ppB962w/4gopXzE1MS46ZAswtufT9fOZTw2mw8qhEf0En2u9RVONJnOyC ObP7x8+sc8hlCTxZh7AXbH4JAg5I/cdOqt04TZ3Y0UpPFnHsej8z41nDJ7MABW3ccjnP SaENuwNJzlW94lJRGmH/eXxyil4QGlNMuZRFSksOgX21kcQ5GUFS19VxSOC5V6fdFWzU CQY9uRXE60ykctRVa+XfUzXtgxLzUGI9GwezIVqb8XXJzt0WjNlaJsGLa9k+D65pXGax J4dqf2ItmABXklQI+irYs5uzf3HDU8qnoef8Vt3KItnHJP/gahJlZntge5Gni+kzpzBu RN9g== 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=cD9UOjMwA5W4yp7DsyXes/EUMgSK55JIngeQBrb2kk0=; b=rX0uah4P8lEy8zygWRW5FbE56/9NxYVD7vGWTMs3MC8ZIEb2Qs0N4P5pzndEKUjkW9 oybnadsF5CmNiC+JYbjQG63eqxFyS+Ie/HWWkfAo4YAIdaxbcYTaDmfdBLhRatBKnlMn XidZ59vajE7aPTosNsKROuDAftkJS/vC5i1coHr3SY1h3cqAMsaGbQFysiym7WFjRn9Z J1kSNkd6A/rROasU4ADhjSHmaXWVtPv13Z0Bn8m1gXgZQC5eF9w8oFrBKuSFNzIOaDkd 4770jRDHO/4c+YnsZ5+LvZYYxWyvK7nLOmtasDMUCXGp8kCNYAfZv3AmL1Q9NZc6P/yD 6WYw== 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 k129-v6si345569qkb.0.2018.06.25.13.14.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Jun 2018 13:14:17 -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]:49050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXXsO-0000Iq-69 for patch@linaro.org; Mon, 25 Jun 2018 16:14:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXXl4-0002g1-42 for qemu-devel@nongnu.org; Mon, 25 Jun 2018 16:06:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXXkz-0002M2-Hf for qemu-devel@nongnu.org; Mon, 25 Jun 2018 16:06:42 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:40227 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 1fXXkz-00023I-AK for qemu-devel@nongnu.org; Mon, 25 Jun 2018 16:06:37 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id D6E4D1A1F8D; Mon, 25 Jun 2018 22:06:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com Received: from rtrkw774-lin.mipstec.com (unknown [82.117.201.26]) by mail.rt-rk.com (Postfix) with ESMTPSA id 9CB171A1FE5; Mon, 25 Jun 2018 22:06:12 +0200 (CEST) From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Mon, 25 Jun 2018 22:05:58 +0200 Message-Id: <1529957164-4744-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529957164-4744-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1529957164-4744-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 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é 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)) {