From nobody Tue Apr 15 03:52:44 2025 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=1589547023; cv=none; d=zohomail.com; s=zohoarc; b=ZUYRlfl5KphmrdLW5RZk+xCLslYt7Y4in0eovqfje6Ve3Oopnb0BMkR1YXlk4gvkvUZXSMlP5+ULYAtQzYaTDqsr7kdp+evgJc94BbijLW1PvJhHhVrxR+IgnVfnNb27zZjTaCqe2yOt8adGdKREQhnWynq0dKZjtcOLZpQD7AU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589547023; 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=UDyGmwNluSmj3AKzcdp88iWWWctet5DfvVCBxbzUFQk=; b=CRWSw3UwlKH0dty7MDpYDQ/s6V2cUf4Xcw4/IWrY+Ax49H0oyhX2GRflNW/jjeuGA+DX2ebVswi7pxl1hbGQi5q4BVGMMaXMx+S5ZBqjBOgk79oEaSLCUkyPqYWPpQv1e0Me8BEzuf0wB0m5kpxEpsCBi7/B7juOwynzzO0pQOc= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158954702332611.315750458839034; Fri, 15 May 2020 05:50:23 -0700 (PDT) Received: from localhost ([::1]:55574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZnC-0001yU-0g for importer@patchew.org; Fri, 15 May 2020 08:50:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZic-000295-Ir for qemu-devel@nongnu.org; Fri, 15 May 2020 08:45:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58551 helo=us-smtp-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 1jZZib-000260-7d for qemu-devel@nongnu.org; Fri, 15 May 2020 08:45:38 -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-189-Uec38bWgOMOH3dTzbeKLlg-1; Fri, 15 May 2020 08:45:33 -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 8068B8014D7; Fri, 15 May 2020 12:45:32 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-110.ams2.redhat.com [10.36.113.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 860F82E024; Fri, 15 May 2020 12:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589546735; 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=UDyGmwNluSmj3AKzcdp88iWWWctet5DfvVCBxbzUFQk=; b=EiLvKn9TdVIf/J0y3ehkYnbYcjGb9v0QbdXKxp0VpP0Isvf92+6nF0xQVKIWUfnVzMC3uR K48GY3bBMb27M/ECTVgTdGR9Er1e3CMxj7lLyWZ79TRjer8jiQki2yk+RIoxaF4qGRepSb hEkO0spW0LRuzWGB58GCENOjJ1e+9wI= X-MC-Unique: Uec38bWgOMOH3dTzbeKLlg-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 02/51] iotests/229: Use blkdebug to inject an error Date: Fri, 15 May 2020 14:44:32 +0200 Message-Id: <20200515124521.335403-3-kwolf@redhat.com> In-Reply-To: <20200515124521.335403-1-kwolf@redhat.com> References: <20200515124521.335403-1-kwolf@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.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/14 22:56:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, 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=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 229 relies on the mirror running into an I/O error when the target is smaller than the source. After changing mirror to catch this condition while starting the job, this test case won't get a job that is paused for an I/O error any more. Use blkdebug instead to inject an error. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Message-Id: <20200511135825.219437-3-kwolf@redhat.com> Reviewed-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Kevin Wolf --- tests/qemu-iotests/229 | 15 +++++++++++---- tests/qemu-iotests/229.out | 6 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229 index 866168b236..a5d4e5d4f2 100755 --- a/tests/qemu-iotests/229 +++ b/tests/qemu-iotests/229 @@ -33,6 +33,7 @@ _cleanup() _cleanup_test_img _rm_test_img "$TEST_IMG" _rm_test_img "$DEST_IMG" + rm -f "$TEST_DIR/blkdebug.conf" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -49,11 +50,10 @@ _supported_os Linux =20 DEST_IMG=3D"$TEST_DIR/d.$IMGFMT" TEST_IMG=3D"$TEST_DIR/b.$IMGFMT" +BLKDEBUG_CONF=3D"$TEST_DIR/blkdebug.conf" =20 _make_test_img 2M - -# destination for mirror will be too small, causing error -TEST_IMG=3D$DEST_IMG _make_test_img 1M +TEST_IMG=3D$DEST_IMG _make_test_img 2M =20 $QEMU_IO -c 'write 0 2M' "$TEST_IMG" | _filter_qemu_io =20 @@ -67,11 +67,18 @@ echo echo '=3D=3D=3D Starting drive-mirror, causing error & stop =3D=3D=3D' echo =20 +cat > "$BLKDEBUG_CONF" <