From patchwork Wed Apr 13 09:10:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8820131 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 BF4B2C0553 for ; Wed, 13 Apr 2016 09:23:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F7F92026C for ; Wed, 13 Apr 2016 09:23:16 +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 52ADD20160 for ; Wed, 13 Apr 2016 09:23:15 +0000 (UTC) Received: from localhost ([::1]:39768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqH10-0006pk-NB for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Apr 2016 05:23:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqGp1-0007Mc-FS for qemu-devel@nongnu.org; Wed, 13 Apr 2016 05:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqGp0-0001tb-AC for qemu-devel@nongnu.org; Wed, 13 Apr 2016 05:10:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqGoy-0001t1-04; Wed, 13 Apr 2016 05:10:48 -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 B2A2C3683C; Wed, 13 Apr 2016 09:10:47 +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 u3D9A07i003879; Wed, 13 Apr 2016 05:10:44 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 13 Apr 2016 17:10:02 +0800 Message-Id: <1460538604-12132-14-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 13/15] ahci-test: Specify "lock-image=off" in CLI 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 The case is the temporary image is sometimes used by more than one QEMU processes, just use the nop lock to avoid image locking failures. Signed-off-by: Fam Zheng --- tests/ahci-test.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 6869f7f..fb3505f 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -179,6 +179,7 @@ static AHCIQState *ahci_boot(const char *cli, ...) va_end(ap); } else { cli = "-drive if=none,id=drive0,file=%s,cache=writeback,serial=%s" + ",lock-image=off" ",format=%s" " -M q35 " "-device ide-hd,drive=drive0 " @@ -1082,6 +1083,7 @@ static void test_flush_retry(void) prepare_blkdebug_script(debug_path, "flush_to_disk"); ahci = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0," "format=%s,cache=writeback," + "lock-image=off," "rerror=stop,werror=stop " "-M q35 " "-device ide-hd,drive=drive0 ", @@ -1107,9 +1109,10 @@ static void test_migrate_sanity(void) char *uri = g_strdup_printf("unix:%s", mig_socket); src = ahci_boot("-m 1024 -M q35 " - "-drive if=ide,file=%s,format=%s ", tmp_path, imgfmt); + "-drive if=ide,file=%s,lock-image=off,format=%s ", + tmp_path, imgfmt); dst = ahci_boot("-m 1024 -M q35 " - "-drive if=ide,file=%s,format=%s " + "-drive if=ide,file=%s,format=%s,lock-image=off " "-incoming %s", tmp_path, imgfmt, uri); ahci_migrate(src, dst, uri); @@ -1132,10 +1135,10 @@ static void ahci_migrate_simple(uint8_t cmd_read, uint8_t cmd_write) char *uri = g_strdup_printf("unix:%s", mig_socket); src = ahci_boot_and_enable("-m 1024 -M q35 " - "-drive if=ide,format=%s,file=%s ", + "-drive if=ide,format=%s,file=%s,lock-image=off ", imgfmt, tmp_path); dst = ahci_boot("-m 1024 -M q35 " - "-drive if=ide,format=%s,file=%s " + "-drive if=ide,format=%s,file=%s,lock-image=off " "-incoming %s", imgfmt, tmp_path, uri); set_context(src->parent); @@ -1192,6 +1195,7 @@ static void ahci_halted_io_test(uint8_t cmd_read, uint8_t cmd_write) prepare_blkdebug_script(debug_path, "write_aio"); ahci = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0," + "lock-image=off," "format=%s,cache=writeback," "rerror=stop,werror=stop " "-M q35 " @@ -1258,6 +1262,7 @@ static void ahci_migrate_halted_io(uint8_t cmd_read, uint8_t cmd_write) prepare_blkdebug_script(debug_path, "write_aio"); src = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0," + "lock-image=off," "format=%s,cache=writeback," "rerror=stop,werror=stop " "-M q35 " @@ -1266,6 +1271,7 @@ static void ahci_migrate_halted_io(uint8_t cmd_read, uint8_t cmd_write) tmp_path, imgfmt); dst = ahci_boot("-drive file=%s,if=none,id=drive0," + "lock-image=off," "format=%s,cache=writeback," "rerror=stop,werror=stop " "-M q35 " @@ -1331,12 +1337,14 @@ static void test_flush_migrate(void) src = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0," "cache=writeback,rerror=stop,werror=stop," + "lock-image=off," "format=%s " "-M q35 " "-device ide-hd,drive=drive0 ", debug_path, tmp_path, imgfmt); dst = ahci_boot("-drive file=%s,if=none,id=drive0," "cache=writeback,rerror=stop,werror=stop," + "lock-image=off," "format=%s " "-M q35 " "-device ide-hd,drive=drive0 "