From nobody Mon Feb 9 21:12:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614599624; cv=none; d=zohomail.com; s=zohoarc; b=dDc3MMIKNu4pxSL1m5kybPYS7M6ReiZZIk8yLUaGjX7G5lR034cPJowoG4488LEjC1tZz3kRNeEjMnI3rxVeSpOrHLFCmof2EY/yWh5LXdODX3fw77Dd+DqNiyhm5R4uxfyrZBCgEHaLqqL/RsS8es+aw/wh6kVkdWVqFFX/Kzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614599624; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=xepneabtMBs6KXDAhAA/tNxteramngj4xAhOLaaKo9c=; b=Wjr67etKAK1dQKNO40DmniMcvdYprnCB+psXsfU4lOdN4uL1AoK20Nr8jAa0XZQ2awRBs52KK1/XPfRts3rrI7KNVNDSFo7Mm3uC8R/5wNZqaEX9loylmtGPU0DoTC82ukCfGgvYbvsXUfj7E4tkfhgbdRklSmbakE3dTc3ueu0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1614599624804120.33068553267651; Mon, 1 Mar 2021 03:53:44 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-229-YdtzsqC5N0WFPCJh_rIHQg-1; Mon, 01 Mar 2021 06:53:42 -0500 Received: by mail-wm1-f69.google.com with SMTP id a63so1183523wmd.8 for ; Mon, 01 Mar 2021 03:53:42 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id j20sm3089944wmp.30.2021.03.01.03.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 03:53:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614599623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xepneabtMBs6KXDAhAA/tNxteramngj4xAhOLaaKo9c=; b=GurEYjKZpb89MJqRGTlzwv06gtN5M0vLYE/37jCIJTnyOTkwE+4kFTaIchoTeiZUbFJY/k Ecm2QqN8IMGMkwZNf7aIzCRrDRD1FfcCaQnyjESSATz2L73hyJlt2wok5RxAHU11+NyQ/1 1LEuCPg9QQ+ATLyOik564p7F+4Kz+Yc= X-MC-Unique: YdtzsqC5N0WFPCJh_rIHQg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xepneabtMBs6KXDAhAA/tNxteramngj4xAhOLaaKo9c=; b=KbptqCNtXyjk+s8T/jQDq8+K3TtKYoWloO7czSlpLg9N1YQgbuBc3+9iQTYJ4hITIF xA3MxEgXKdMa32Ylv62lsQOYsV6iCh0lcUQsBSN3Nk+cwFyYcF1jPcK5jSA0JjSJyizs 5MxHVRZubRHw4rTLTo2NT62JM3wpLcYTbFaIX4qJwJJK7xCuvjU4IisrepkuLu8icIp8 EXRR6bfbJgXdd1JTDWgJAj86a4dL4HXePUwBG6ng0ynBx5ofU/0QS7Skyvej4up7tecx 45NQ3TqLuVsovZfcY8I2t65kY/YM8c1LGlBrUJ+YE34g02WyWAa7DoX/8r4O682FukEU bDYg== X-Gm-Message-State: AOAM5322zTd6fjhvs7Js6o9qo0K1XHuu3dCaDx0J6DTPXgYhEB4u3gva vAwLnaiypHPfUElXPg2VbwqKJBLJzEFGXj+79yGHtQyw6MdkPeKY2BiFSxADnk3B9EfTWpx4l6L g1sokAnjljZjQ6A== X-Received: by 2002:a05:6000:191:: with SMTP id p17mr10412723wrx.154.1614599621233; Mon, 01 Mar 2021 03:53:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbSJLJuO+qUHga/oM29TRxmPqrK07VydbWzvMt7RdfoPM8pPg8OJhd2ySGk59IiVOlBfTLaw== X-Received: by 2002:a05:6000:191:: with SMTP id p17mr10412706wrx.154.1614599621111; Mon, 01 Mar 2021 03:53:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, David Edmondson Cc: Max Reitz , Markus Armbruster , Kevin Wolf , Paolo Bonzini , qemu-block@nongnu.org, Xu Yandong , haibinzhang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Stefano Garzarella Subject: [RFC PATCH v2 2/3] hw/block/pflash: Move code around Date: Mon, 1 Mar 2021 12:53:28 +0100 Message-Id: <20210301115329.411762-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210301115329.411762-1-philmd@redhat.com> References: <20210301115329.411762-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) First do the block checks, so we know if it is read-only or not. Then create the MemoryRegion. This will allow optimization in the next commit. Reviewed-by: David Edmondson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 24 ++++++++++++------------ hw/block/pflash_cfi02.c | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 22287a1522e..a5fa8d8b74a 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -731,18 +731,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Err= or **errp) } device_len =3D sector_len_per_device * blocks_per_device; =20 - memory_region_init_rom_device( - &pfl->mem, OBJECT(dev), - &pflash_cfi01_ops, - pfl, - pfl->name, total_len, errp); - if (*errp) { - return; - } - - pfl->storage =3D memory_region_get_ram_ptr(&pfl->mem); - sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); - if (pfl->blk) { uint64_t perm; pfl->ro =3D !blk_supports_write_perm(pfl->blk); @@ -755,6 +743,18 @@ static void pflash_cfi01_realize(DeviceState *dev, Err= or **errp) pfl->ro =3D 0; } =20 + memory_region_init_rom_device( + &pfl->mem, OBJECT(dev), + &pflash_cfi01_ops, + pfl, + pfl->name, total_len, errp); + if (*errp) { + return; + } + + pfl->storage =3D memory_region_get_ram_ptr(&pfl->mem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); + if (pfl->blk) { if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, total_len, errp)) { diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 7962cff7455..4f62ce8917d 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -791,15 +791,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Err= or **errp) return; } =20 - memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), - &pflash_cfi02_ops, pfl, pfl->name, - pfl->chip_len, errp); - if (*errp) { - return; - } - - pfl->storage =3D memory_region_get_ram_ptr(&pfl->orig_mem); - if (pfl->blk) { uint64_t perm; pfl->ro =3D !blk_supports_write_perm(pfl->blk); @@ -812,6 +803,15 @@ static void pflash_cfi02_realize(DeviceState *dev, Err= or **errp) pfl->ro =3D 0; } =20 + memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), + &pflash_cfi02_ops, pfl, pfl->name, + pfl->chip_len, errp); + if (*errp) { + return; + } + + pfl->storage =3D memory_region_get_ram_ptr(&pfl->orig_mem); + if (pfl->blk) { if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, pfl->chip_len, errp)) { --=20 2.26.2