From nobody Wed Nov 19 04:33:30 2025 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=1614294179; cv=none; d=zohomail.com; s=zohoarc; b=dODCm93+TpTZj6/qgnjkoY//flBQ7L8FBoXWmFg6aSQjR8zseyQ922PJCqhaePt5wEGm8sDYBIOa2JsNZ6rOz39TMyP+imqfdaWZakglOtcnpJ0Dq9EjuW6vnq3s2240k4Ky7xHCGuB67u76eGNwDlJuTruSrgMmXvdb0zMO/YY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614294179; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=nJG0er+QNebAk4w+3LZsO8sLinAOdx+C5yOC5sTpKQE=; b=Ukv8snpxmkjT8UX0v62du0HoZUeLOCJDj+9mT4O3gTfrXut59JqiKLL9bkc0kVbCxSjSv8rV6IfYGUt4E1CK1kPETJcXBKjVwALZxfCS0OZ+IT3kEk5vLWuFjdngUNhJvWU5L8F1PQ7iU44IbujwxjpcoR5h+xNFoI2buTXSOAc= 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 1614294179632569.7701836252145; Thu, 25 Feb 2021 15:02:59 -0800 (PST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-457-7ozMN4sbNZyZt5Z8KO7RXQ-1; Thu, 25 Feb 2021 18:02:54 -0500 Received: by mail-ed1-f72.google.com with SMTP id dk21so3599521edb.10 for ; Thu, 25 Feb 2021 15:02:54 -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 i13sm3906372ejj.2.2021.02.25.15.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 15:02:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614294178; 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=nJG0er+QNebAk4w+3LZsO8sLinAOdx+C5yOC5sTpKQE=; b=HUCq70hLfyLA7UVP2Mx3QxaojFxsPHSNmSrsnZAU/NAS7CIEjqy2VfxgF2D9AKqi318aSK /YGWNcoOMHUej/umvUZ8gmydIMqRIi+URqtKVTCQ4xmELuR9ZgcX8tIoAX4fZgjBJSviTp nKpUmP+Nfrn8u23fImwO1Gt0BrhD0uM= X-MC-Unique: 7ozMN4sbNZyZt5Z8KO7RXQ-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=nJG0er+QNebAk4w+3LZsO8sLinAOdx+C5yOC5sTpKQE=; b=mM8nIm2lTlwd3+cLFCQ8fy0T6WKsgTKc87OHDFWxDG8eNWz7p+CCpUpoXvQlh5L99j 7+6z3cyLE8ChAEo+ZRsFkYCOUY+vszK/HzFGpvOG5WxZP4olJFNJ+SCceAFd0/PoUmqp T/f1IKdZX78FI/xUiYTv9EUceCi/oXaQjqTR/2U3z5O7S6MYEVuOxY9UPyHIh4ArTpqp SS5ZVCycX/gpscDzkz7YPMOx3ypXH41DFf80giOhkS+tdJ9vPsX71cma4uVp8W5bAgaC ooE1CjSHvjuil0lA2rTJ0sg6JjTZm+IQIPcLTiJCx1RBoWxt5wjZXcOUefkzGuk4P3lp gsTQ== X-Gm-Message-State: AOAM532EYAvLe6syebFw+4pZRxgEW8w7nXCQK7765WwM5kQn/cS/6l1g e88J7ahWgEBxCLF9jHrG9iCvLE1k6XoJ3QAxzTNxIjPRNk1X4qn6zWAaXVkZ2n1fx6YMtlQzAV7 NSTeKmeG5VIGH0Q== X-Received: by 2002:a17:906:3510:: with SMTP id r16mr5259865eja.186.1614294173433; Thu, 25 Feb 2021 15:02:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwRF6AYpnGCVCg3wn6q8pITbe5nkeK/eQVx9U0JsXetVKsyh8lYFLsBBieZs9vqr6mtZ/H9Hw== X-Received: by 2002:a17:906:3510:: with SMTP id r16mr5259841eja.186.1614294173309; Thu, 25 Feb 2021 15:02:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, David Edmondson Cc: Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , haibinzhang , Zheng Xiang , qemu-block@nongnu.org, Paolo Bonzini , Xu Yandong , Kevin Wolf , Stefano Garzarella , Max Reitz Subject: [RFC PATCH 2/3] hw/block/pflash: Move code around Date: Fri, 26 Feb 2021 00:02:37 +0100 Message-Id: <20210225230238.3719051-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210225230238.3719051-1-philmd@redhat.com> References: <20210225230238.3719051-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Edmondson --- 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