From nobody Sat Nov 15 17:04:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595944208; cv=none; d=zohomail.com; s=zohoarc; b=DU8C3CQ/J5lSfnFCpEJ4J7WhKlqR3TYRaOJzXvKBmRBASOtK3Krg0mvlk+MRORP6Wdp0UrHKoaQtRP2c6JxvjZvVgCGQ0yV7JaC0BIi79yZa0mB4JKWTXJ62BLBV7h84G4VXG4LBG6ij25D5V8W3HeZW605Vrcb2xlD71fBK9mA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595944208; 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=ZWcaw+9QYRJWq7c/S4sft0iQIOuruhTzciGwRrLdre0=; b=FuB4zQwDJp/qTUGjjHyvF+NSqSu+CNYfqUZW3UW6Ki1q0RfTae4J1JKAwrGr9QK85TnkH2lIE6lzez4a96dCoTYKW8q7wykVnbd8mE4G3jvqO+9ZZoDp1T5Qa/1nkRYLLfCHLeqVwxr+4EjXXdoZ9CrfkSEU0ULhK3S/NCeuvY8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 159594420898771.77464378056027; Tue, 28 Jul 2020 06:50:08 -0700 (PDT) Received: from localhost ([::1]:37908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0Pzb-0001Rt-Ji for importer@patchew.org; Tue, 28 Jul 2020 09:50:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0PyP-0008CS-UG for qemu-devel@nongnu.org; Tue, 28 Jul 2020 09:48:53 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:60187 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0PyN-0003tE-Fg for qemu-devel@nongnu.org; Tue, 28 Jul 2020 09:48:53 -0400 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-474-k5IvCq7lMFezzJLTcMjR9A-1; Tue, 28 Jul 2020 09:48:48 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6894E79EC0; Tue, 28 Jul 2020 13:48:44 +0000 (UTC) Received: from localhost (ovpn-112-145.ams2.redhat.com [10.36.112.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0367A5D9CD; Tue, 28 Jul 2020 13:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595944130; 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=ZWcaw+9QYRJWq7c/S4sft0iQIOuruhTzciGwRrLdre0=; b=NDJ5uhAq8K9il8UsD41kyGOgiyHjx192PhnBD9TzVASJFjUh8/rs6G64agwknUMnbNYZzd Y73mbmGIwISlr+mZAbMLfxwdxAr8lA8QT/00PlowahhSYclzMR/wJEqZnR9pKDfcEzyIeT i5bsv/XHYWOOLcmjavGNzS9kFsaYUOg= X-MC-Unique: k5IvCq7lMFezzJLTcMjR9A-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 1/3] block: Fix bdrv_aligned_p*v() for qiov_offset != 0 Date: Tue, 28 Jul 2020 15:48:38 +0200 Message-Id: <20200728134840.1557546-2-mreitz@redhat.com> In-Reply-To: <20200728134840.1557546-1-mreitz@redhat.com> References: <20200728134840.1557546-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/28 06:02:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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" Since these functions take a @qiov_offset, they must always take it into account when working with @qiov. There are a couple of places where they do not, but they should. Fixes: 65cd4424b9df03bb5195351c33e04cbbecc0705c ("block/io: bdrv_aligned_preadv: use and support qiov_offset") Fixes: 28c4da28695bdbe04b336b2c9c463876cc3aaa6d ("block/io: bdrv_aligned_pwritev: use and support qiov_offset") Reported-by: Claudio Fontana Reported-by: Bruce Rogers Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Message-Id: <20200728120806.265916-2-mreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Tested-by: Claudio Fontana Tested-by: Bruce Rogers --- block/io.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block/io.c b/block/io.c index b6564e34c5..ad3a51ed53 100644 --- a/block/io.c +++ b/block/io.c @@ -1524,12 +1524,13 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChi= ld *child, assert(num); =20 ret =3D bdrv_driver_preadv(bs, offset + bytes - bytes_remainin= g, - num, qiov, bytes - bytes_remaining, 0= ); + num, qiov, + qiov_offset + bytes - bytes_remaining= , 0); max_bytes -=3D num; } else { num =3D bytes_remaining; - ret =3D qemu_iovec_memset(qiov, bytes - bytes_remaining, 0, - bytes_remaining); + ret =3D qemu_iovec_memset(qiov, qiov_offset + bytes - bytes_re= maining, + 0, bytes_remaining); } if (ret < 0) { goto out; @@ -2032,7 +2033,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChil= d *child, } =20 ret =3D bdrv_driver_pwritev(bs, offset + bytes - bytes_remaini= ng, - num, qiov, bytes - bytes_remaining, + num, qiov, + qiov_offset + bytes - bytes_remainin= g, local_flags); if (ret < 0) { break; --=20 2.26.2 From nobody Sat Nov 15 17:04:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595944321; cv=none; d=zohomail.com; s=zohoarc; b=MwujtMSK1xBlx2/5D+pSpCB5Zw3tLfqGOzfvGLx7rIsnmnGl3f9MWCSYLtxqAZwBzkaL/j5TWkvFaFdwltn3kMRSlRbJhaB48K+urq3AtE2UYTQnbT3bZE/S6rd3ejAcI3Q+UroRlrtzs0NiFy1QVC8DPEWUko/d5sFd/28Gsf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595944321; 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=YBehD8Sh7kAqTspoSET6GnAY59GUzI6vERZ/x0WwPyI=; b=ggw4Zq9bPyTgvnW1eUgOu6ofaNeqQgXyWI3B2rDyWsCKmubXlo/yud3oCx2swmvx2als+Gy4VXxQ4lO4N4J+f8b10l4OezpOzeNWsgfIEVlO2d52WqSchVp2iQPTBjp92eJHGabngi4J2EH8HBtaCGq2s9blbUTzhQw4wfEwlSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1595944321146537.0788123586663; Tue, 28 Jul 2020 06:52:01 -0700 (PDT) Received: from localhost ([::1]:45652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0Q1P-0004gP-NA for importer@patchew.org; Tue, 28 Jul 2020 09:51:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0PyQ-0008Cx-7V for qemu-devel@nongnu.org; Tue, 28 Jul 2020 09:48:54 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:49689 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0PyO-0003tR-Kr for qemu-devel@nongnu.org; Tue, 28 Jul 2020 09:48:53 -0400 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-347-e077iFJLMWGI0M3LjgVv3Q-1; Tue, 28 Jul 2020 09:48:47 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85E00101C8A9; Tue, 28 Jul 2020 13:48:46 +0000 (UTC) Received: from localhost (ovpn-112-145.ams2.redhat.com [10.36.112.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F81619C4F; Tue, 28 Jul 2020 13:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595944131; 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=YBehD8Sh7kAqTspoSET6GnAY59GUzI6vERZ/x0WwPyI=; b=VfTEnY6sTsX67MKVOBYqLFPuHVYjMKCKMIjU1FdNzQ5eLTSzY0tJ5ebCgRD+ckp0/mtEah S8oYkWfTaeL/NYi3ZnadMcBPPsGpuPg/Lcg/H/2DTI+jtkkLFCkgJRG8viRQaHOKDv2tv+ y+BeeyFxG5RYCwDO6cs2aA9rwI/IOac= X-MC-Unique: e077iFJLMWGI0M3LjgVv3Q-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 2/3] iotests/028: Add test for cross-base-EOF reads Date: Tue, 28 Jul 2020 15:48:39 +0200 Message-Id: <20200728134840.1557546-3-mreitz@redhat.com> In-Reply-To: <20200728134840.1557546-1-mreitz@redhat.com> References: <20200728134840.1557546-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/28 00:06:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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" Signed-off-by: Max Reitz Message-Id: <20200728120806.265916-3-mreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Tested-by: Vladimir Sementsov-Ogievskiy Tested-by: Claudio Fontana --- tests/qemu-iotests/028 | 19 +++++++++++++++++++ tests/qemu-iotests/028.out | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 5d043cef92..6dd3ae09a3 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -142,6 +142,25 @@ TEST_IMG=3D"${TEST_IMG}.copy" io_zero readv $(( offset= + 32 * 1024 )) 512 1024 32 =20 _check_test_img =20 +echo +echo '=3D=3D=3D Reading across backing EOF in one operation =3D=3D=3D' +echo + +# Use a cluster boundary as the base end here +base_size=3D$((3 * 1024 * 1024 * 1024)) + +TEST_IMG=3D"$TEST_IMG.base" _make_test_img $base_size +_make_test_img -b "$TEST_IMG.base" -F $IMGFMT $image_size + +# Write 16 times 42 at the end of the base image +$QEMU_IO -c "write -P 42 $((base_size - 16)) 16" "$TEST_IMG.base" \ + | _filter_qemu_io + +# Read 32 bytes across the base EOF from the top; +# should be 16 times 0x2a, then 16 times 0x00 +$QEMU_IO -c "read -v $((base_size - 16)) 32" "$TEST_IMG" \ + | _filter_qemu_io + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out index 12f82c6a6c..5a68de5c46 100644 --- a/tests/qemu-iotests/028.out +++ b/tests/qemu-iotests/028.out @@ -730,4 +730,15 @@ read 512/512 bytes at offset 3221257728 read 512/512 bytes at offset 3221258752 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) No errors were found on the image. + +=3D=3D=3D Reading across backing EOF in one operation =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D3221225472 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4294968832 backing_fil= e=3DTEST_DIR/t.IMGFMT.base backing_fmt=3DIMGFMT +wrote 16/16 bytes at offset 3221225456 +16 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +bffffff0: 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a ..............= .. +c0000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ..............= .. +read 32/32 bytes at offset 3221225456 +32 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done --=20 2.26.2 From nobody Sat Nov 15 17:04:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595944217; cv=none; d=zohomail.com; s=zohoarc; b=CMcOzq1Ch+Ft1dfw8j4WvqkSOJWny8xiYCu0d/ym7jOiGravHO7NUXqPOAUze0xlp1rKicddmOumcblswXVtk4AuTf3uYyMT1Xfgtq++BBYvMN11y3Gj79yKHu5sufWGs7vRfhQnoHue8vBF3whA5L2a7l3474rZ2ZqdNrZhTdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595944217; 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=mlMrdIXLzJJirKfVg8qQNIPA0qZScZa3KKwIAXzhr38=; b=UJT93vgVd2nOjGue110AGudYtiNp2pAv1t49RL7cIy6E20SdIC6I2kB9eJT9lKB94H2eBsbMTIGACGvmHncNFdickMNje8j8xNBrzVgEl493KElzh7cNWHeeqbhJ0XHxsTP1GirXbGrrDS7/v0Q+wnUhOLM0lyTXwMLF/yC4KHE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1595944217749895.2585269047247; Tue, 28 Jul 2020 06:50:17 -0700 (PDT) Received: from localhost ([::1]:38750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0Pzk-0001mg-9c for importer@patchew.org; Tue, 28 Jul 2020 09:50:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0PyT-0008JK-G6 for qemu-devel@nongnu.org; Tue, 28 Jul 2020 09:48:57 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:24048 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0PyR-0003ts-Ux for qemu-devel@nongnu.org; Tue, 28 Jul 2020 09:48:57 -0400 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-239-YHMlM3P8NyKh_jw8RZc57w-1; Tue, 28 Jul 2020 09:48:51 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCD3F801A03; Tue, 28 Jul 2020 13:48:48 +0000 (UTC) Received: from localhost (ovpn-112-145.ams2.redhat.com [10.36.112.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71A9519C4F; Tue, 28 Jul 2020 13:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595944135; 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=mlMrdIXLzJJirKfVg8qQNIPA0qZScZa3KKwIAXzhr38=; b=e8VCeyDRKvBPctafUpDTOCL3LnIrpHRDueQx9cfemLPoTj+sdnei5shhMkZ+rJl6m7FoBx cK2j92zpSH7/7hrwffoZ1Vju6eQMK/ttrKrfvabqZGavH0hwPCs1npI226gqks+E3tAwT2 1J3Zin96MnSrdJfAI2L+Ggv9vMCJ/aQ= X-MC-Unique: YHMlM3P8NyKh_jw8RZc57w-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 3/3] iotests/197: Fix for non-qcow2 formats Date: Tue, 28 Jul 2020 15:48:40 +0200 Message-Id: <20200728134840.1557546-4-mreitz@redhat.com> In-Reply-To: <20200728134840.1557546-1-mreitz@redhat.com> References: <20200728134840.1557546-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/28 00:06:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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" While 197 is very much a qcow2 test, and it looks like the partial cluster case at the end (introduced in b0ddcbbb36a66a6) is specifically a qcow2 case, the whole test scripts actually marks itself to work with generic formats (and generic protocols, even). Said partial cluster case happened to work with non-qcow2 formats as well (mostly by accident), but 1855536256 broke that, because it sets the compat option, which does not work for non-qcow2 formats. So go the whole way and force IMGFMT=3Dqcow2 and IMGPROTO=3Dfile, as done in other places in this test. Fixes: 1855536256eb0a5708b04b85f744de69559ea323 ("iotests/197: Fix for compat=3D0.10") Reported-by: Thomas Huth Signed-off-by: Max Reitz Message-Id: <20200728131134.902519-1-mreitz@redhat.com> Reviewed-by: Eric Blake --- tests/qemu-iotests/197 | 8 +++++--- tests/qemu-iotests/197.out | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 index 121959a09c..a161c89816 100755 --- a/tests/qemu-iotests/197 +++ b/tests/qemu-iotests/197 @@ -114,9 +114,11 @@ echo =20 # Force compat=3D1.1, because writing zeroes on a v2 image without a # backing file would just result in an unallocated cluster -_make_test_img -o compat=3D1.1 1024 -$QEMU_IO -f $IMGFMT -C -c 'read 0 1024' "$TEST_IMG" | _filter_qemu_io -$QEMU_IO -f $IMGFMT -c map "$TEST_IMG" +# (Also, note that this is really a pure qcow2 test.) +IMGPROTO=3Dfile IMGFMT=3Dqcow2 TEST_IMG_FILE=3D"$TEST_WRAP" \ + _make_test_img --no-opts -o compat=3D1.1 1024 +$QEMU_IO -f qcow2 -C -c 'read 0 1024' "$TEST_WRAP" | _filter_qemu_io +$QEMU_IO -f qcow2 -c map "$TEST_WRAP" _check_test_img =20 # success, all done diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out index 7ca46be6e4..ad414c3b0e 100644 --- a/tests/qemu-iotests/197.out +++ b/tests/qemu-iotests/197.out @@ -26,7 +26,7 @@ Images are identical. =20 =3D=3D=3D Partial final cluster =3D=3D=3D =20 -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1024 +Formatting 'TEST_DIR/t.wrap.IMGFMT', fmt=3DIMGFMT size=3D1024 read 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 1 KiB (0x400) bytes allocated at offset 0 bytes (0x0) --=20 2.26.2