From patchwork Mon Jun 4 11:03:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 137623 Delivered-To: patches@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1361842lji; Mon, 4 Jun 2018 04:04:01 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJLkr8GNpvDH/8CQlU3q3WUiSZWSb/5bcDkzmEA4Xt/+4QM5nv7CUXPGpy0E6tNF808U98+ X-Received: by 2002:adf:b86b:: with SMTP id u40-v6mr15638997wrf.162.1528110241553; Mon, 04 Jun 2018 04:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528110241; cv=none; d=google.com; s=arc-20160816; b=i6NcIrjfmaUCidG/OW1NjDlrk/269/xlZUel6TgsVN34xtE+kVE+EjufpxIe4txVEP z0SLCP5BudNFrJwXT3MfUrVkWyglkOcP6vZ4LiYDKv/nn5CyxOUy2iKfZ2IGKxPH2HjW vGZvG5AaqB9CR5NirJ4u1OHtLAZjo3OcYY2zRGgE5VVB75OjKmrIMD+MKP9uuJtosnGs A7xK6ldqXLCckur44Y6LvbpMZsFb7G9t1UUyoqCSDlJx0QPUNafqvi5E1jW/kTJmRtEk d3jkJgkE+raCEuTT9vmx9RJG5lCM+PzhB/ebmqKPwbQfUo5sla2a6TP3p86xP/tOgc5J H4vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Cpub/rI1u1yFNSgR/dmSaxO4SqeOBeTufb7nrR0ad6E=; b=ffD/mU5rxK3w3nW7NiuzbrG2dGyVI2jafyLiESSCqO2+DcmfNOZRk0tXPQd23omtZ4 29TjdAHQtz5vmNYi0Mwg1UZHMJEfA83nfzfTQxrP5eRGTZwYp0IFVn5W3utIkTeGTflk UOmL/skXrNzumQwa7+U3LRFmhKgaohghT0TDdy51XZIG7uCv5k6UTp90DCSO2N2SdsIs 7vMBbe+qgSH0mAXe9CZ1U/1BYC4OIuTDUYr6eQAf/1tnbXJ8UVZJBwZvqO7SO/ArutFF oVPvO6gBZuC+pMn+Z1Ve3tvJSCA2P0Y2xIdh/TiNg4bv72R4LOKRd1r1zcgXzk6mqaQF +a3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id a1-v6si23089473wrh.348.2018.06.04.04.04.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Jun 2018 04:04:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fPnHM-0006ok-Ng; Mon, 04 Jun 2018 12:04:00 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paul Burton , Aurelien Jarno , Yongbok Kim , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Juan Quintela , dgilbert@redhat.com Subject: [PATCH 1/2] hw/mips/boston: don't make flash region 'nomigrate' Date: Mon, 4 Jun 2018 12:03:57 +0100 Message-Id: <20180604110358.2821-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180604110358.2821-1-peter.maydell@linaro.org> References: <20180604110358.2821-1-peter.maydell@linaro.org> 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 --- hw/mips/boston.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 5302e5c885..1d136529ad 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); From patchwork Mon Jun 4 11:03:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 137625 Delivered-To: patches@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1361854lji; Mon, 4 Jun 2018 04:04:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJnvB/V4DuEZqmSlOjNbnKfDLpTwr1fUkHDIWU2YXKfV+n21IUSr4XMgWvupceewD2XdyyU X-Received: by 2002:a1c:9d49:: with SMTP id g70-v6mr9493463wme.134.1528110242009; Mon, 04 Jun 2018 04:04:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528110242; cv=none; d=google.com; s=arc-20160816; b=MtOT8krsom8i369w6m0FTgxuBlMrL8qXEKjG/9iFfvS/zKmJ6O+PiuAz4022OaWaR1 7bstnR9HjbhRA+anxjFm3C8nq7VAAGhnW2DbvZS/468iJVI/n4t+/3VtW2tH1duHnAjx AAMr2mnxUxsrxCVYZbG+Ytk5KKZeQAtZJ+VO4cffqJQnMIglkkqq1mSv3z4ZfGLA1DA9 EjYrqJZLxmL3VrLqNGgTRtsTmedSBYxSSHHZRR6OkF5ozz/SXkiTmzQRuboj+MpBaFDq lb/AFFc/TlKCkwGhVx14xwzz3C+Yz4aamre/4sku4oL5JtYSMnbKHcgzvyHaXiS6LZ4o zQoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=shES8470A/HeGf44jNaeNT7b8wSb6fy2UP7J5RFAdjs=; b=RLDIyTIV/qQ1qJJ91XjoqV/hqm3Nq4eShehrCcLapZBIjiuQ07po+KroRhioqDAylS TWv7gUly7NksKMljSC8KuRv4Fhb6nlHc2DGKoWGfgQDiZcTNNcV/O9y0g6kBkRnRhaUK iNBNlAVnL+v8zBQ9RmFY+mYUqWCBCQZKhniS/yHe04w4xp0aulDyx24XhszXQPZCv+aK xCr62Av973j6xX+rExwEzFdfRkqaFysZ8kp9q4uWu8cqtQ+tbaJCJOttlo5OmearF5cL 2aWou2mOt07XqKS/UYmMGyaIsveHy0Od0ztl14x0urPQXijEoWDExElOefcQ8EI1TT12 xFJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id w204-v6si6268864wma.44.2018.06.04.04.04.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Jun 2018 04:04:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fPnHN-0006p2-FF; Mon, 04 Jun 2018 12:04:01 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paul Burton , Aurelien Jarno , Yongbok Kim , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Juan Quintela , dgilbert@redhat.com Subject: [PATCH 2/2] hw/mips/mips_malta: don't make bios region 'nomigrate' Date: Mon, 4 Jun 2018 12:03:58 +0100 Message-Id: <20180604110358.2821-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180604110358.2821-1-peter.maydell@linaro.org> References: <20180604110358.2821-1-peter.maydell@linaro.org> 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(-) -- 2.17.1 Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé 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)) {