From nobody Tue Nov 26 16:44:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706651596; cv=none; d=zohomail.com; s=zohoarc; b=iYPj3besHqgTV9qs1l9+SYgTLT1kjDaqWzVFFHGSI6Yz5sIrfWF1xiM+IHFzxZw9H7Po6J6JPtjxNcN3oahccmZ761I7PQEkgZgj88Bhyzf9Td+u2crNwyGZ++2RFtby4fT87+td13Bls+b6SMHE9beUyp5BqD5bS9lZJUD5S8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706651596; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XDUgZHDlvWeA7rh+OjrSJr8WhdVme2HVQIvgJAMUWGU=; b=Ar+WraVPVZpGXUhGkpQYcxYNXOoqvX7wFLS4GIJwZqocH3XkQ5EcpedsDFW6QlUe1/HXv4ZUqu14vip2xjq+F83nZmlRyHF6UJpC8222ETyzLd2rJThrLxcpAQ6OzrXAjhrvYCQXCjHR53W1lIp5j3FopNsFEutv7VI/ZiLiVXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706651596332414.58328992702377; Tue, 30 Jan 2024 13:53:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUw1X-0002Py-Jj; Tue, 30 Jan 2024 16:52:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUw1H-0002CR-OR for qemu-devel@nongnu.org; Tue, 30 Jan 2024 16:51:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUw1F-0005nd-Il for qemu-devel@nongnu.org; Tue, 30 Jan 2024 16:51:50 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-wHgEU0fUNviTw7PSIP1T_w-1; Tue, 30 Jan 2024 16:51:45 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FF523869143; Tue, 30 Jan 2024 21:51:44 +0000 (UTC) Received: from localhost (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B7E040C9444; Tue, 30 Jan 2024 21:51:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706651507; 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=XDUgZHDlvWeA7rh+OjrSJr8WhdVme2HVQIvgJAMUWGU=; b=FqCx2UJZf9LBemxJmAtm733DjieYq70pfkVifZ/BX2Vezdzsy26NBK39k1DrtfIXEJjalb MqAx60SlsPl9NVfEI4uQtS1pu59ntesi0Bpajik4NPCZ4jKha0v+Rn7qZXyNXkLzme874b mt7HFAa4Wtxl2HDpdUBNWaJqnxtTEag= X-MC-Unique: wHgEU0fUNviTw7PSIP1T_w-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aarushi Mehta , Fam Zheng , Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Julia Suvorova , Stefano Garzarella , Alistair Francis , Peter Maydell , Hanna Reitz , Xiang Zheng Subject: [PULL 3/5] pflash: fix sectors vs bytes confusion in blk_pread_nonzeroes() Date: Tue, 30 Jan 2024 16:51:32 -0500 Message-ID: <20240130215134.346557-4-stefanha@redhat.com> In-Reply-To: <20240130215134.346557-1-stefanha@redhat.com> References: <20240130215134.346557-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.292, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1706651597525100001 The following expression is incorrect because blk_pread_nonzeroes() deals in units of bytes, not sectors: bytes =3D MIN(size - offset, BDRV_REQUEST_MAX_SECTORS) ^^^^^^^ BDRV_REQUEST_MAX_BYTES is the appropriate constant. Fixes: a4b15a8b9ef2 ("pflash: Only read non-zero parts of backend image") Cc: Xiang Zheng Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20240130002712.257815-1-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/block/block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/block.c b/hw/block/block.c index 9f52ee6e72..ff503002aa 100644 --- a/hw/block/block.c +++ b/hw/block/block.c @@ -30,7 +30,7 @@ static int blk_pread_nonzeroes(BlockBackend *blk, hwaddr = size, void *buf) BlockDriverState *bs =3D blk_bs(blk); =20 for (;;) { - bytes =3D MIN(size - offset, BDRV_REQUEST_MAX_SECTORS); + bytes =3D MIN(size - offset, BDRV_REQUEST_MAX_BYTES); if (bytes <=3D 0) { return 0; } --=20 2.43.0