From patchwork Tue Sep 30 11:27:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 394914 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 B3FC71400A0 for ; Tue, 30 Sep 2014 21:29:01 +1000 (EST) Received: from localhost ([::1]:42547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYvc3-0006Oc-IQ for incoming@patchwork.ozlabs.org; Tue, 30 Sep 2014 07:28:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYvaZ-00045z-1b for qemu-devel@nongnu.org; Tue, 30 Sep 2014 07:27:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYvaS-0005YD-V4 for qemu-devel@nongnu.org; Tue, 30 Sep 2014 07:27:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYvaS-0005Wp-Nj for qemu-devel@nongnu.org; Tue, 30 Sep 2014 07:27:20 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8UBRFZ3010336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 30 Sep 2014 07:27:15 -0400 Received: from noname.str.redhat.com (dhcp-192-197.str.redhat.com [10.33.192.197]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8UBRBeq000731; Tue, 30 Sep 2014 07:27:14 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Tue, 30 Sep 2014 13:27:10 +0200 Message-Id: <1412076430-11623-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1412076430-11623-1-git-send-email-kwolf@redhat.com> References: <1412076430-11623-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 2/2] qemu-iotests: Fix supported cache modes for 052 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 The requirement for this test case is really "no O_DIRECT", because the temporary snapshot for BDRV_O_SNAPSHOT is created in /tmp, which often is a tmpfs. Commit f210a83c ('qemu-iotests: Add _default_cache_mode and _supported_cache_modes') turned the restriction into writethrough-only, but that's not really necessary. Allow to run the test for any non-O_DIRECT cache modes, and use the global default of writeback if no cache mode is specified. Signed-off-by: Kevin Wolf --- tests/qemu-iotests/052 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index 6bdae92..61959e2 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -41,8 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file _supported_os Linux -_default_cache_mode "writethrough" -_supported_cache_modes "writethrough" + +# Don't do O_DIRECT on tmpfs +_supported_cache_modes "writeback" "writethrough" "unsafe" size=128M _make_test_img $size