From nobody Mon Feb 9 08:56:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1572858357; cv=none; d=zoho.com; s=zohoarc; b=TyoQ2jCyglhcQbS1Sz8YajriEpqmRf0i7sOWlk5rf2R2jY+YL0+XUFjOkjCmIKYu9n5l3QihVoIc33Z27mXP8JpKwFpqpTwebDBl3fFgAzw2te6GlGz4AR/X+WWiO19myo8quoTSgyN2XJQLx3WLCw8LAzb2DTc6u1dXqHm62No= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572858357; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2gqxhpNHUfIaIwcmwOFm6C8eab2g7cgHMKq1J40k/qM=; b=YmVvlPiflUd2A/5mIsqJnZKTnJFryPo0BdIMbj8hiOeCpZxC0Tl2++Jrqk0N1RRj0Sk3HdlTMi7AjZrRTnFv7q7QUuZBMhLWBcrTuCJ5MGnp/GkZi20pj6d6xMyjwgwY6O5HqSIsi8lYy9vwmIhxRAIVUTjjgGX1iJufIlaQFfc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572858357322269.476522828921; Mon, 4 Nov 2019 01:05:57 -0800 (PST) Received: from localhost ([::1]:58610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRYJ9-0000jW-LW for importer@patchew.org; Mon, 04 Nov 2019 04:05:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34768) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRYHV-0007N7-Ol for qemu-devel@nongnu.org; Mon, 04 Nov 2019 04:04:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRYHJ-00032t-PK for qemu-devel@nongnu.org; Mon, 04 Nov 2019 04:04:05 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:37480 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iRYHJ-0002yb-8N for qemu-devel@nongnu.org; Mon, 04 Nov 2019 04:04:01 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-44-CbRMszHVMPSk0lywyLO3cw-1; Mon, 04 Nov 2019 04:03:54 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5CFAF1005500; Mon, 4 Nov 2019 09:03:53 +0000 (UTC) Received: from localhost (ovpn-117-85.ams2.redhat.com [10.36.117.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F330C60874; Mon, 4 Nov 2019 09:03:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572858237; 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=2gqxhpNHUfIaIwcmwOFm6C8eab2g7cgHMKq1J40k/qM=; b=I4cMF+WZ7PwjgNsxKJ4XV9luq3uL8aB5iODDFUKJQLQXlTTVb6sS4MKn1Br61HsqIfOQCm nQYYWhMWK4MQLxA0B2H3pdIftm2m21uWpiXNqRzy4d96HSvthhGJ9rs8O4XZ1OyoIf5q0h VUxlN/popWF83lKwHvFaLHSkBisp1J4= From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 2/5] block/block-copy: fix s->copy_size for compressed cluster Date: Mon, 4 Nov 2019 10:03:44 +0100 Message-Id: <20191104090347.27278-3-mreitz@redhat.com> In-Reply-To: <20191104090347.27278-1-mreitz@redhat.com> References: <20191104090347.27278-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: CbRMszHVMPSk0lywyLO3cw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy 0e2402452f1f20429 allowed writes larger than cluster, but that's unsupported for compressed write. Fix it. Fixes: 0e2402452f1f20429 Signed-off-by: Vladimir Sementsov-Ogievskiy Message-id: 20191029150934.26416-1-vsementsov@virtuozzo.com Signed-off-by: Max Reitz --- block/block-copy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index c39cc9cffe..79798a1567 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -109,9 +109,9 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,= BdrvChild *target, s->use_copy_range =3D false; s->copy_size =3D cluster_size; } else if (write_flags & BDRV_REQ_WRITE_COMPRESSED) { - /* Compression is not supported for copy_range */ + /* Compression supports only cluster-size writes and no copy-range= . */ s->use_copy_range =3D false; - s->copy_size =3D MAX(cluster_size, BLOCK_COPY_MAX_BUFFER); + s->copy_size =3D cluster_size; } else { /* * copy_range does not respect max_transfer (it's a TODO), so we f= actor --=20 2.21.0