From nobody Wed Nov 5 09:13:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499438802720848.9859602166875; Fri, 7 Jul 2017 07:46:42 -0700 (PDT) Received: from localhost ([::1]:56901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTUWm-0000GI-E8 for importer@patchew.org; Fri, 07 Jul 2017 10:46:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTUTS-0005rA-NZ for qemu-devel@nongnu.org; Fri, 07 Jul 2017 10:43:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTUTR-00044B-W7 for qemu-devel@nongnu.org; Fri, 07 Jul 2017 10:43:14 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTUTR-00040L-OV for qemu-devel@nongnu.org; Fri, 07 Jul 2017 10:43:13 -0400 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 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 08/11] hw/block/pflash_cfi01, pflash_cfi02: Use memory_region_init_rom_device() 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: Marcel Apfelbaum , Paolo Bonzini , Igor Mammedov , Eduardo Habkost , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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(-) 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, Erro= r **errp) return NULL; #endif =20 - 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, Erro= r **errp) return; } =20 - vmstate_register_ram(&pfl->mem, DEVICE(pfl)); pfl->storage =3D memory_region_get_ram_ptr(&pfl->mem); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); =20 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, Erro= r **errp) return NULL; #endif =20 - memory_region_init_rom_device_nomigrate(&pfl->orig_mem, OBJECT(pfl), p= fl->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, Erro= r **errp) return; } =20 - vmstate_register_ram(&pfl->orig_mem, DEVICE(pfl)); pfl->storage =3D memory_region_get_ram_ptr(&pfl->orig_mem); pfl->chip_len =3D chip_len; =20 --=20 2.7.4