From patchwork Fri May 8 17:22:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 470137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A434D14012C for ; Sat, 9 May 2015 03:34:25 +1000 (AEST) Received: from localhost ([::1]:56992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqmAJ-0005vQ-QP for incoming@patchwork.ozlabs.org; Fri, 08 May 2015 13:34:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yqlzd-0003Qd-0r for qemu-devel@nongnu.org; Fri, 08 May 2015 13:23:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqlzY-00050S-Ad for qemu-devel@nongnu.org; Fri, 08 May 2015 13:23:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqlzV-0004xt-WB; Fri, 08 May 2015 13:23:14 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 933353A62BC; Fri, 8 May 2015 17:23:13 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t48HMDg5019849; Fri, 8 May 2015 13:23:12 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 8 May 2015 19:22:01 +0200 Message-Id: <1431105726-3682-30-git-send-email-kwolf@redhat.com> In-Reply-To: <1431105726-3682-1-git-send-email-kwolf@redhat.com> References: <1431105726-3682-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH 29/34] qemu-iotests: Remove cache mode test without medium X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Specifying the cache mode for a driver without a medium is not a useful thing to do: As long as there is no medium, the cache mode doesn't make a difference, and once the 'change' command is used to insert a medium, it ignores the old cache mode and makes the new medium use cache=writethrough. Later patches will make it an error to specify the cache mode for an empty drive. Remove the corresponding test case. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- tests/qemu-iotests/051 | 14 -------------- tests/qemu-iotests/051.out | 26 -------------------------- 2 files changed, 40 deletions(-) diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 0360f37..e236685 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -176,20 +176,6 @@ run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk echo -echo === Cache modes === -echo - -# Cannot use the test image because cache=none might not work on the host FS -# Use cdrom so that we won't get errors about missing media - -run_qemu -drive media=cdrom,cache=none -run_qemu -drive media=cdrom,cache=directsync -run_qemu -drive media=cdrom,cache=writeback -run_qemu -drive media=cdrom,cache=writethrough -run_qemu -drive media=cdrom,cache=unsafe -run_qemu -drive media=cdrom,cache=invalid_value - -echo echo === Specifying the protocol layer === echo diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index 2890eac..2e3b48a 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -221,32 +221,6 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -=== Cache modes === - -Testing: -drive media=cdrom,cache=none -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - -Testing: -drive media=cdrom,cache=directsync -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - -Testing: -drive media=cdrom,cache=writeback -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - -Testing: -drive media=cdrom,cache=writethrough -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - -Testing: -drive media=cdrom,cache=unsafe -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - -Testing: -drive media=cdrom,cache=invalid_value -QEMU_PROG: -drive media=cdrom,cache=invalid_value: invalid cache option - - === Specifying the protocol layer === Testing: -drive file=TEST_DIR/t.qcow2,file.driver=file