From patchwork Mon Jun 25 20:05:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Markovic X-Patchwork-Id: 139890 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4390065lji; Mon, 25 Jun 2018 13:10:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfMR+tV47VfED1k3qdVd1PVEPq5+QbfDPf7PYPBpjoxIbNiLV5o9nwsyhhPezzjKl4LmXun X-Received: by 2002:ac8:2d0e:: with SMTP id n14-v6mr12610095qta.338.1529957405674; Mon, 25 Jun 2018 13:10:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529957405; cv=none; d=google.com; s=arc-20160816; b=aEF75C9VZeBkykU0E/yb8glOqyTuVA+HVF/egjCq1GrMf4J5PekdsnKanSU8Dg9msM SUoGeovutFGbY+iGQiEzAAo1Dq3qghTFHs7MbFg6FlCmxkGbvwgRvpWLLMeAAb9Jqnj9 OQLcdogvENGKUgmACGA8M+/0kD95dvlwvk3BZLqljElDF+3g/YJ+38Uu0dk6LhLJWnWF xiueZyYqAKwu08SMc6BkM6WATeYAJg0FJ11Q2Z/ujfJhfHlJ8ZF585das4ohh0nu6znj 4csCaCboGa1L+JCnRh2OWQDCv/+0CziFrZH24zNl7pa70KepH7ZJOG2mYEPCPGuC5E5M rPUg== 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=9k921rpx9YV8/GBsMZ1SW/Aot2hj5YV7G9fcBBZM6zg=; b=UUcKpjCtLGWx+yU/X9TgEeIgJauuqi03EcGCNc3R+6PhwsSwE3RC3gwDsWeMEcp36y 3fxnwft7NGHKaXSWoS31BnvNvV46zq1EdSxkIrVlkl1mijWytO0l7tWf/rW9435SCRwo RE9zhlNGofeRDhDR5C1F3UkzQERAi6v0A8ddLX3AYNWC9vFOC5RUzbQo5XFHSVHFZraO wjNLqmPcprCsV8URTIlkEe0kCROjjV6hkY6EElVVymCxvgjewRUg/XIsagM+fCkG9ZdD 2KOJQXQ0EX73fxLrimeTzGdlqprmaqrguVfxdyaaDedJwZGxzpJYTPeqOI5iH8F9Zbhb 7IIw== 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 203-v6si1027410qkj.123.2018.06.25.13.10.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Jun 2018 13:10:05 -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]:49030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXXoK-000531-Sy for patch@linaro.org; Mon, 25 Jun 2018 16:10:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXXl4-0002g5-G4 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-0002Ly-Hd for qemu-devel@nongnu.org; Mon, 25 Jun 2018 16:06:42 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:40224 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-00023E-9p 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 B8AEE1A2040; 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 9609D1A1F8D; Mon, 25 Jun 2018 22:06:12 +0200 (CEST) From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Mon, 25 Jun 2018 22:05:57 +0200 Message-Id: <1529957164-4744-3-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 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é 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);