From patchwork Fri Jul 7 14:42:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 107203 Delivered-To: patches@linaro.org Received: by 10.140.101.44 with SMTP id t41csp147293qge; Fri, 7 Jul 2017 07:43:04 -0700 (PDT) X-Received: by 10.28.136.129 with SMTP id k123mr2616208wmd.14.1499438584160; Fri, 07 Jul 2017 07:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499438584; cv=none; d=google.com; s=arc-20160816; b=y4ENr4pIJDZuohSrH7s2y9YrdwlMPrHtWoqWzT5RkHOzgRKt4OjSWzSgaCCtAYXII3 EATWy9zEIEHG7sOEBHBcjkuprlboi3CzNtz6WMOrPkDL0AyNMaa2AO/15lepfWu64VyU kOfk/kdScAukF11uxaq+VBbAYOEyqTOGJjDGB76WV/xRZs1aI7rWYRN1h2XdUXvlp70o oyD68b7E3OJ2USVKJx2lNIG1XtMgXpdtH4bHxQKOzCNkj54jRFsHCq2Bf8BKP7oEeu4R KvEvPunfU9zra5D8o1R+xb5KERQPN5k6l2DL/pSqLglgcbS8oKlVjq8GB59MrQTvhTc4 oYPg== 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=4NybmyQ0IQR8FQOlNXDrzTInKJWQDZJTzj35Z3CrK8U=; b=UTKv3eAqZfVYKKOTZ+IwIWOtjMmIwHzrxXQgVE7PMHy2aychp6Mh7KNLfXOYkllwgg 5BMYWwRP4rdAYTHYXkhOzbhepb0yyzura+R5jTwAKRcc8qx0R5zXdIUdoHwtmK9WSTlI 5K1Oc534r0pHJ8kBO2iNvKcYq7SSydVIc9J1sew/RjK/otSrzIW9MuFcIqMvNB+nhHPR +mLfWtc7OGTXngi7ToVsRSf3jbPg5RZjB0RclLVN3Kdh9GPzP1pO9uzpsfbpYeweD4Jx 9uWRyUvYs/ta+D9T807m3A2EIGyoPQXZusExjDjqPEZluneczLzcbwMX9yn5QtVh5Icr 20ng== 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 49si2424350wrx.82.2017.07.07.07.43.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jul 2017 07:43:04 -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.84_2) (envelope-from ) id 1dTUTH-0005uU-Mu; Fri, 07 Jul 2017 15:43:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , Eduardo Habkost , Marcel Apfelbaum , Igor Mammedov Subject: [PATCH 08/11] hw/block/pflash_cfi01, pflash_cfi02: Use memory_region_init_rom_device() Date: Fri, 7 Jul 2017 15:42:54 +0100 Message-Id: <1499438577-7674-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499438577-7674-1-git-send-email-peter.maydell@linaro.org> References: <1499438577-7674-1-git-send-email-peter.maydell@linaro.org> Since we pass the same DeviceState object to memory_region_init_rom_device_nomigrate() and vmstate_register_ram(), we can switch to using memory_region_init_rom_device() instead. Signed-off-by: Peter Maydell --- hw/block/pflash_cfi01.c | 3 +-- hw/block/pflash_cfi02.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index c044b56..1113ab1 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -743,7 +743,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) return NULL; #endif - memory_region_init_rom_device_nomigrate( + memory_region_init_rom_device( &pfl->mem, OBJECT(dev), &pflash_cfi01_ops, pfl, @@ -753,7 +753,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) return; } - vmstate_register_ram(&pfl->mem, DEVICE(pfl)); pfl->storage = memory_region_get_ram_ptr(&pfl->mem); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index a08b09b..c81ddd3 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -621,7 +621,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) return NULL; #endif - memory_region_init_rom_device_nomigrate(&pfl->orig_mem, OBJECT(pfl), pfl->be ? + memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), pfl->be ? &pflash_cfi02_ops_be : &pflash_cfi02_ops_le, pfl, pfl->name, chip_len, &local_err); if (local_err) { @@ -629,7 +629,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) return; } - vmstate_register_ram(&pfl->orig_mem, DEVICE(pfl)); pfl->storage = memory_region_get_ram_ptr(&pfl->orig_mem); pfl->chip_len = chip_len;