From nobody Sun May 19 03:38:14 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552927845150462.09476502874895; Mon, 18 Mar 2019 09:50:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:44501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5vTC-0004F3-L5 for importer@patchew.org; Mon, 18 Mar 2019 12:50:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5vRv-0003mV-IO for qemu-devel@nongnu.org; Mon, 18 Mar 2019 12:49:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5vRt-00038G-If for qemu-devel@nongnu.org; Mon, 18 Mar 2019 12:49:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39866) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h5vRp-00036O-P1; Mon, 18 Mar 2019 12:49:14 -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 mx1.redhat.com (Postfix) with ESMTPS id 835C0356DE; Mon, 18 Mar 2019 16:49:12 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-164.ams2.redhat.com [10.36.117.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BE82171C3; Mon, 18 Mar 2019 16:49:10 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 18 Mar 2019 17:49:05 +0100 Message-Id: <20190318164905.432-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 18 Mar 2019 16:49:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] qemu-iotests: Fix 232 for non-qcow2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 232 is marked as generic, but commit 12efe428c9e added code that assumes qcow2. What the new test really needs is backing files and support for updating the backing file link (.bdrv_change_backing_file). Split the non-generic code into a new test case 247 and make it work with qed, too. Signed-off-by: Kevin Wolf --- tests/qemu-iotests/232 | 30 --------------- tests/qemu-iotests/232.out | 20 ---------- tests/qemu-iotests/247 | 79 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/247.out | 22 +++++++++++ tests/qemu-iotests/group | 1 + 5 files changed, 102 insertions(+), 50 deletions(-) create mode 100755 tests/qemu-iotests/247 create mode 100644 tests/qemu-iotests/247.out diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232 index 0de097fc88..2063f78876 100755 --- a/tests/qemu-iotests/232 +++ b/tests/qemu-iotests/232 @@ -144,36 +144,6 @@ run_qemu_info_block -blockdev driver=3Dfile,filename= =3D"$TEST_IMG",node-name=3Dnode0,a run_qemu_info_block -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-na= me=3Dnode0,auto-read-only=3Don run_qemu_info_block -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-na= me=3Dnode0 =20 -echo -echo "=3D=3D=3D Try commit to backing file with auto-read-only =3D=3D=3D" -echo - -TEST_IMG=3D"$TEST_IMG.0" _make_test_img $size -TEST_IMG=3D"$TEST_IMG.1" _make_test_img $size -TEST_IMG=3D"$TEST_IMG.2" _make_test_img $size -TEST_IMG=3D"$TEST_IMG.3" _make_test_img $size -TEST_IMG=3D"$TEST_IMG.4" _make_test_img $size - -(cat <. +# + +# creator +owner=3Dkwolf@redhat.com + +seq=3D`basename $0` +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img + rm -f $TEST_IMG.[01234] +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +# Requires backing files and .bdrv_change_backing_file support +_supported_fmt qcow2 qed +_supported_proto file +_supported_os Linux + +size=3D128M + +echo +echo "=3D=3D=3D Try commit to backing file with auto-read-only =3D=3D=3D" +echo +TEST_IMG=3D"$TEST_IMG.0" _make_test_img $size +TEST_IMG=3D"$TEST_IMG.1" _make_test_img $size +TEST_IMG=3D"$TEST_IMG.2" _make_test_img $size +TEST_IMG=3D"$TEST_IMG.3" _make_test_img $size +TEST_IMG=3D"$TEST_IMG.4" _make_test_img $size + +(cat <