From patchwork Fri Apr 20 12:48:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 133873 Delivered-To: patches@linaro.org Received: by 10.46.66.142 with SMTP id h14csp240285ljf; Fri, 20 Apr 2018 05:48:38 -0700 (PDT) X-Google-Smtp-Source: AIpwx49MDscRayWeDGcBF9u4MF3TdEuY8dyT3IlWS3FuoSrZSbXBgvRtBK4I4p/rHDy0D2Ftn7kR X-Received: by 2002:adf:b303:: with SMTP id j3-v6mr8124809wrd.165.1524228518779; Fri, 20 Apr 2018 05:48:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524228518; cv=none; d=google.com; s=arc-20160816; b=Jp/j14jKsjs/tFw0k2mNp1vQlsR4VRyVKJCOjvG7/RZkaRqGu6r16yIfsbu8i5rTzv HW2fbJQcB9RHi6Jeve8Aw7hhAG7M6nnogOACYzO3RGz3R0QD2gHUtBOfhl47rQ3lGgbF hqQymU7XGWS7jWajGOW8g88Qv3OH65txkIO2mSy6/hdDo4EaoQpV+RVGMeyHkziJO6iU Smhg5wMyEMUpdKJREMT2Fcgj8VJKvBzFKRD+Y1I/FxpiUaViU7inUZqjkQwPiLKCcl3D 9pAL3XXNUtw2kYg/t4V7ZGKRu2QWWSUo3Fro1nypPgPBgoG4KLqjjaWn9zmaL5xe9b/x qkPQ== 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=0hzWiXfWmBaT9sDT9A5zS+9gnpxdlNquGUAZ6mbnyd8=; b=G1UJ26WgViBMhBfOk9l3/QxcKIhYyQxfs5iuQBL3zGVBwIdqQVQAu9gOHzcyj+G+hv +oao30l7jqe3m6Gqc5SddBlyPNjBjZCHtAsLmYZXsssyHKcxTrFqQXLroETFJLHBqXLw XQKkV1z29g2QTGpaRUoPu+wijO+ewLi6UtTtUL0tadvTmXnMc1v5cKAP4U5pv00pIHqN ywF8W9rXq8CwsobS9cCHfhAdHpbY0imqOWYMmx9IWbYn4Cjqk1u7lmMWNTqnWjmMMi4a e53TAwxFp5djhO5XnH0u8eVAgtIXtS2Edql6LVfWuks8BSv53NO2xW96gadx1SuybxEd +QLg== 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 r13-v6si4697111wre.420.2018.04.20.05.48.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Apr 2018 05:48:38 -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 1f9VSw-0004mn-1d; Fri, 20 Apr 2018 13:48:38 +0100 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Rob Herring , =?utf-8?q?C=C3=A9dric_Le_Goater?= , "Dr. David Alan Gilbert" Subject: [PATCH 2/3] hw/arm/aspeed: don't make 'boot_rom' region 'nomigrate' Date: Fri, 20 Apr 2018 13:48:34 +0100 Message-Id: <20180420124835.7268-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420124835.7268-1-peter.maydell@linaro.org> References: <20180420124835.7268-1-peter.maydell@linaro.org> Currently we use memory_region_init_ram_nomigrate() to create the "aspeed.boot_rom" 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 cross-version migration compatibility break for the "palmetto-bmc", "ast2500-evb" and "romulus-bmc" machines. Signed-off-by: Peter Maydell --- hw/arm/aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.0 Reviewed-by: Cédric Le Goater Tested-by: Cédric Le Goater diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 7088c907bd..aecb3c1e75 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -225,7 +225,7 @@ static void aspeed_board_init(MachineState *machine, * SoC and 128MB for the AST2500 SoC, which is twice as big as * needed by the flash modules of the Aspeed machines. */ - memory_region_init_rom_nomigrate(boot_rom, OBJECT(bmc), "aspeed.boot_rom", + memory_region_init_rom(boot_rom, OBJECT(bmc), "aspeed.boot_rom", fl->size, &error_abort); memory_region_add_subregion(get_system_memory(), FIRMWARE_ADDR, boot_rom);