From nobody Mon May 6 10:17:17 2024 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; 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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1572361995; cv=none; d=zoho.com; s=zohoarc; b=LZ5sH5SDhJH/TnyzuswyvPW1J6mFn525oseEfKS4lxttyKzaHW/lV51Vy2w/6dXLGEmgmEFr2FhuT1h90cNMVlEn3aAr9gfTB1R0g9j+3FtudtUtwBIdG98AflS9Rv6RVoWgH2+HPgjtTFWXTw/INlJtVGXNXQPDpbxwhptv7zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572361995; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=DrCGerLpz+iejkjvtNKztuy9g8R3CMx6oPC/e3eTcoE=; b=j1fr4Tu+IfLPfkcveAsrIwzCpcEZWEn4f70pA4UhCXA93SKZMYznDzlGpCK1wQBQBzzdKDcVDTbVOOxxWdL/PxGjpOB5HtiGjX0eIrT3DcbSGci2k3wibeXtXAKn5uhSRJbnZCsIE41A2zD7HMMv+OwBbQb50RkgjYeRYQUKCz8= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1572361995560628.310149586015; Tue, 29 Oct 2019 08:13:15 -0700 (PDT) Received: from localhost ([::1]:58208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPTBI-0002Ya-22 for importer@patchew.org; Tue, 29 Oct 2019 11:13:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPT85-0007wy-KX for qemu-devel@nongnu.org; Tue, 29 Oct 2019 11:09:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPT80-00051f-OP for qemu-devel@nongnu.org; Tue, 29 Oct 2019 11:09:53 -0400 Received: from relay.sw.ru ([185.231.240.75]:37192) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iPT7r-0004yz-17; Tue, 29 Oct 2019 11:09:39 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iPT7n-00062X-F9; Tue, 29 Oct 2019 18:09:35 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH] block/block-copy: fix s->copy_size for compressed cluster Date: Tue, 29 Oct 2019 18:09:34 +0300 Message-Id: <20191029150934.26416-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 0e2402452f1f20429 allowed writes larger than cluster, but that's unsupported for compressed write. Fix it. Fixes: 0e2402452f1f20429 Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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