From patchwork Wed Apr 13 09:10:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8819831 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 582EDC0553 for ; Wed, 13 Apr 2016 09:17:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C331A202D1 for ; Wed, 13 Apr 2016 09:17:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2170A2026C for ; Wed, 13 Apr 2016 09:17:34 +0000 (UTC) Received: from localhost ([::1]:39622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqGvV-0005or-GG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Apr 2016 05:17:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqGpD-0007qc-OL for qemu-devel@nongnu.org; Wed, 13 Apr 2016 05:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqGp8-0001wU-6F for qemu-devel@nongnu.org; Wed, 13 Apr 2016 05:11:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqGp1-0001to-DR; Wed, 13 Apr 2016 05:10:51 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 25045C04B30B; Wed, 13 Apr 2016 09:10:51 +0000 (UTC) Received: from lemon.nay.redhat.com (dhcp-14-170.nay.redhat.com [10.66.14.170]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3D9A07j003879; Wed, 13 Apr 2016 05:10:48 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 13 Apr 2016 17:10:03 +0800 Message-Id: <1460538604-12132-15-git-send-email-famz@redhat.com> In-Reply-To: <1460538604-12132-1-git-send-email-famz@redhat.com> References: <1460538604-12132-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 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 for-2.7 14/15] ide-test: Specify "lock-image=off" in command lines 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: Kevin Wolf , qemu-block@nongnu.org, Jeff Cody , Markus Armbruster , Max Reitz , den@openvz.org, pbonzini@redhat.com, John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a failure in a previous test case doesn't clean up the running qemu process (it happens), the subsequent ones can fail because of a image locking failure. That is not an authentic failure of the test case itself and could be sometimes confusing. Disable image locking to avoid that. Signed-off-by: Fam Zheng --- tests/ide-test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/ide-test.c b/tests/ide-test.c index 0d9ab4d..004ea4f 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -504,7 +504,8 @@ static void test_flush(void) uint8_t data; ide_test_start( - "-drive file=blkdebug::%s,if=ide,cache=writeback,format=raw", + "-drive file=blkdebug::%s,if=ide,lock-image=off," + "cache=writeback,format=raw", tmp_path); /* Delay the completion of the flush request until we explicitly do it */ @@ -546,7 +547,7 @@ static void test_retry_flush(const char *machine) ide_test_start( "-vnc none " "-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw," - "rerror=stop,werror=stop", + "rerror=stop,werror=stop,lock-image=off", debug_path, tmp_path); /* FLUSH CACHE command on device 0*/