From nobody Tue Feb 10 09:11:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763783404429948.8996453858095; Fri, 21 Nov 2025 19:50:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMd8M-000612-J3; Fri, 21 Nov 2025 21:13:55 -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 1vMcuq-0000NK-Em; Fri, 21 Nov 2025 20:59:56 -0500 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMctJ-00080x-A6; Fri, 21 Nov 2025 20:59:53 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0845416CA69; Fri, 21 Nov 2025 21:44:26 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id B8988321CA5; Fri, 21 Nov 2025 21:44:34 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Alberto Garcia , Eric Blake , Thomas Huth , Michael Tokarev Subject: [Stable-10.0.7 46/81] tests/qemu-iotest: fix iotest 024 with qed images Date: Fri, 21 Nov 2025 21:43:45 +0300 Message-ID: <20251121184424.1137669-46-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=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-ZM-MESSAGEID: 1763783404826018900 Content-Type: text/plain; charset="utf-8" From: Alberto Garcia Use 'qemu-io -c map' instead of 'qemu-img map' to get an output that works with both image types. Cc: qemu-stable Fixes: 909852ba6b4a ("qemu-img rebase: don't exceed IO_BUF_SIZE in one oper= ation") Fixes: 585d5c1db8bd ("qemu-img rebase: don't exceed IO_BUF_SIZE in one oper= ation") in 10.0.x Signed-off-by: Alberto Garcia Message-ID: <20251112170959.700840-1-berto@igalia.com> Reviewed-by: Eric Blake Tested-by: Thomas Huth Signed-off-by: Eric Blake (cherry picked from commit 4c91719a6a78a1c24d8bb854f7594e767962d0d9) Signed-off-by: Michael Tokarev diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index 021169b4a1..10be2bd845 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -359,7 +359,7 @@ $QEMU_IO "$OVERLAY" -c "read -P 0x00 0 1M" | _filter_q= emu_io $QEMU_IO "$OVERLAY" -c "read -P 0xff 1M 2M" | _filter_qemu_io $QEMU_IO "$OVERLAY" -c "read -P 0x00 3M 1M" | _filter_qemu_io =20 -$QEMU_IMG map "$OVERLAY" | _filter_qemu_img_map +$QEMU_IO -c map "$OVERLAY" | _filter_qemu_io =20 echo =20 diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out index 1b7522ba71..da8fedc08b 100644 --- a/tests/qemu-iotests/024.out +++ b/tests/qemu-iotests/024.out @@ -266,7 +266,6 @@ read 2097152/2097152 bytes at offset 1048576 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 1048576/1048576 bytes at offset 3145728 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -Offset Length File -0 0x400000 TEST_DIR/subdir/t.IMGFMT +4 MiB (0x400000) bytes allocated at offset 0 bytes (0x0) =20 *** done --=20 2.47.3