From nobody Thu Dec 18 17:51:54 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1560521575; cv=none; d=zoho.com; s=zohoarc; b=AgUrSUk161ecivcxgyodRmpXLmKxmNm9PuJxjbCFUFOLw/mI9DtcMF4MWUlWqWGWDG/8jfo3gi/Zx/lmGr1TdjGzMGsgjfZHg1poBk9DwZm5tWiu4W7vTpmUPmd0zs2+dabilBcKiJeffXxXojaB1CY0Ik6sjXCQaMjAaFUhFhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560521575; h=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:ARC-Authentication-Results; bh=enMOCVWWNFq9nNA4tTDUVc5nswcqq5KkEq5mCfINKbo=; b=DRy9U+0u/BJTA6Z4D1aPl7NmEW3UIwn2zzrSzicw1ce0V2B0Ttz+e07io7eqxhWwr8CpEHLBEjZj9wLBeGS3hQChzBntvxxtEvNgcuNZoGMISXEruaOL7xN/DZ2ZN2CfDoZDp1xEoqDIO0l+MtLysx3N4bkE3nTlvcSAbOETYNI= 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 1560521575427881.1301729871943; Fri, 14 Jun 2019 07:12:55 -0700 (PDT) Received: from localhost ([::1]:51900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbmwo-00030D-G8 for importer@patchew.org; Fri, 14 Jun 2019 10:12:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47005) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbmSu-000284-Ri for qemu-devel@nongnu.org; Fri, 14 Jun 2019 09:42:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbmSs-0006er-Tp for qemu-devel@nongnu.org; Fri, 14 Jun 2019 09:42:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29963) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbmSY-0006HQ-Jy; Fri, 14 Jun 2019 09:41:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C1F4CC049D67; Fri, 14 Jun 2019 13:41:17 +0000 (UTC) Received: from localhost (unknown [10.40.205.125]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A90C17983; Fri, 14 Jun 2019 13:41:17 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 14 Jun 2019 15:40:21 +0200 Message-Id: <20190614134021.32486-21-mreitz@redhat.com> In-Reply-To: <20190614134021.32486-1-mreitz@redhat.com> References: <20190614134021.32486-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 14 Jun 2019 13:41:17 +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] [PULL 20/20] iotests: Test qemu-img convert -C --salvage 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" Content-Type: text/plain; charset="utf-8" We do not support this combination (yet), so this should yield an error message. Signed-off-by: Max Reitz Tested-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Vladimir Sementsov-Ogievskiy Message-id: 20190507203508.18026-8-mreitz@redhat.com Signed-off-by: Max Reitz --- tests/qemu-iotests/082 | 1 + tests/qemu-iotests/082.out | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index bbbdf555dc..3286c2c6db 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -162,6 +162,7 @@ echo =3D=3D=3D convert: -C and other options =3D=3D=3D run_qemu_img convert -C -S 4k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target run_qemu_img convert -C -S 8k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target run_qemu_img convert -C -c -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target +run_qemu_img convert -C --salvage -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target =20 echo echo =3D=3D=3D amend: Options specified more than once =3D=3D=3D diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out index 7e25706813..58de358b38 100644 --- a/tests/qemu-iotests/082.out +++ b/tests/qemu-iotests/082.out @@ -567,6 +567,9 @@ qemu-img: Cannot enable copy offloading when -S is used Testing: convert -C -c -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target qemu-img: Cannot enable copy offloading when -c is used =20 +Testing: convert -C --salvage -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.t= arget +qemu-img: Cannot use copy offloading in salvaging mode + =3D=3D=3D amend: Options specified more than once =3D=3D=3D =20 Testing: amend -f foo -f qcow2 -o lazy_refcounts=3Don TEST_DIR/t.qcow2 --=20 2.21.0