From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747091779137.82744092139353; Thu, 20 Apr 2017 20:58:11 -0700 (PDT) Received: from localhost ([::1]:56970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Phx-00077R-8W for importer@patchew.org; Thu, 20 Apr 2017 23:58:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgB-0005cG-8g for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgA-0003fR-BQ for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47812) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pg7-0003eQ-QC; Thu, 20 Apr 2017 23:56:16 -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 82EEF3DE42; Fri, 21 Apr 2017 03:56:14 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FEDF17966; Fri, 21 Apr 2017 03:56:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 82EEF3DE42 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 82EEF3DE42 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:47 +0800 Message-Id: <20170421035606.448-2-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.29]); Fri, 21 Apr 2017 03:56:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 01/20] block: Add, parse and store "force-shared-write" option 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng Reviewed-by: Kevin Wolf --- block.c | 9 +++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 1 + 3 files changed, 12 insertions(+) diff --git a/block.c b/block.c index 1e668fb..f5c4e97 100644 --- a/block.c +++ b/block.c @@ -763,6 +763,7 @@ static void bdrv_inherited_options(int *child_flags, QD= ict *child_options, * the parent. */ qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_DIREC= T); qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_NO_FL= USH); + qdict_copy_default(child_options, parent_options, BDRV_OPT_FORCE_SHARE= D_WRITE); =20 /* Inherit the read-only option from the parent if it's not set */ qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY); @@ -871,6 +872,7 @@ static void bdrv_backing_options(int *child_flags, QDic= t *child_options, * which is only applied on the top level (BlockBackend) */ qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_DIREC= T); qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_NO_FL= USH); + qdict_copy_default(child_options, parent_options, BDRV_OPT_FORCE_SHARE= D_WRITE); =20 /* backing files always opened read-only */ qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on"); @@ -1115,6 +1117,11 @@ QemuOptsList bdrv_runtime_opts =3D { .type =3D QEMU_OPT_STRING, .help =3D "discard operation (ignore/off, unmap/on)", }, + { + .name =3D BDRV_OPT_FORCE_SHARED_WRITE, + .type =3D QEMU_OPT_BOOL, + .help =3D "always accept other writers (default: off)", + }, { /* end of list */ } }, }; @@ -1154,6 +1161,8 @@ static int bdrv_open_common(BlockDriverState *bs, Blo= ckBackend *file, drv =3D bdrv_find_format(driver_name); assert(drv !=3D NULL); =20 + bs->force_shared_write =3D qemu_opt_get_bool(opts, BDRV_OPT_FORCE_SHAR= ED_WRITE, false); + if (file !=3D NULL) { filename =3D blk_bs(file)->filename; } else { diff --git a/include/block/block.h b/include/block/block.h index 5ddc0cf..d3afb75 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -109,6 +109,8 @@ typedef struct HDGeometry { #define BDRV_OPT_CACHE_NO_FLUSH "cache.no-flush" #define BDRV_OPT_READ_ONLY "read-only" #define BDRV_OPT_DISCARD "discard" +#define BDRV_OPT_FORCE_SHARED_WRITE \ + "force-shared-write" =20 =20 #define BDRV_SECTOR_BITS 9 diff --git a/include/block/block_int.h b/include/block/block_int.h index 59400bd..fb81692 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -518,6 +518,7 @@ struct BlockDriverState { bool valid_key; /* if true, a valid encryption key has been set */ bool sg; /* if true, the device is a /dev/sg* */ bool probed; /* if true, format was probed rather than specified */ + bool force_shared_write; /* if true, always allow shared write perm. */ =20 BlockDriver *drv; /* NULL means no media */ void *opaque; --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747092284149.4242096063399; Thu, 20 Apr 2017 20:58:12 -0700 (PDT) Received: from localhost ([::1]:56971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Phx-00077g-QH for importer@patchew.org; Thu, 20 Apr 2017 23:58:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgD-0005e1-4R for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgC-0003gA-C1 for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41978) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgA-0003fC-CO; Thu, 20 Apr 2017 23:56:18 -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 36EDF90240; Fri, 21 Apr 2017 03:56:17 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12BD817966; Fri, 21 Apr 2017 03:56:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 36EDF90240 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 36EDF90240 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:48 +0800 Message-Id: <20170421035606.448-3-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.26]); Fri, 21 Apr 2017 03:56:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 02/20] qapi: Add 'force-shared-write' to blockdev-add arguments 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng Reviewed-by: Kevin Wolf --- qapi/block-core.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index 033457c..b9b8002 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2880,6 +2880,8 @@ # (default: false) # @detect-zeroes: detect and optimize zero writes (Since 2.1) # (default: off) +# @force-shared-write: enforce shared write permission on added nodes +# (Since 2.10) # # Remaining options are determined by the block driver. # @@ -2891,6 +2893,7 @@ '*discard': 'BlockdevDiscardOptions', '*cache': 'BlockdevCacheOptions', '*read-only': 'bool', + '*force-shared-write': 'bool', '*detect-zeroes': 'BlockdevDetectZeroesOptions' }, 'discriminator': 'driver', 'data': { --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747231131983.4239826730296; Thu, 20 Apr 2017 21:00:31 -0700 (PDT) Received: from localhost ([::1]:56987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PkD-0000fb-P9 for importer@patchew.org; Fri, 21 Apr 2017 00:00:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgI-0005iA-5U for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgH-0003hj-D1 for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgD-0003gI-DQ; Thu, 20 Apr 2017 23:56:21 -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 4537C2D8EB2; Fri, 21 Apr 2017 03:56:20 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD83017966; Fri, 21 Apr 2017 03:56:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4537C2D8EB2 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4537C2D8EB2 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:49 +0800 Message-Id: <20170421035606.448-4-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.38]); Fri, 21 Apr 2017 03:56:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 03/20] block: Respect "force-shared-write" in perm propagating 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng --- block.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index f5c4e97..6acf618 100644 --- a/block.c +++ b/block.c @@ -1422,6 +1422,21 @@ static int bdrv_child_check_perm(BdrvChild *c, uint6= 4_t perm, uint64_t shared, static void bdrv_child_abort_perm_update(BdrvChild *c); static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shar= ed); =20 +static void bdrv_child_perm(BlockDriverState *bs, BdrvChild *c, + const BdrvChildRole *role, + uint64_t parent_perm, uint64_t parent_shared, + uint64_t *nperm, uint64_t *nshared) +{ + if (bs->drv && bs->drv->bdrv_child_perm) { + bs->drv->bdrv_child_perm(bs, c, role, + parent_perm, parent_shared, + nperm, nshared); + } + if (bs->force_shared_write) { + *nshared |=3D BLK_PERM_WRITE; + } +} + /* * Check whether permissions on this node can be changed in a way that * @cumulative_perms and @cumulative_shared_perms are the new cumulative @@ -1466,9 +1481,9 @@ static int bdrv_check_perm(BlockDriverState *bs, uint= 64_t cumulative_perms, /* Check all children */ QLIST_FOREACH(c, &bs->children, next) { uint64_t cur_perm, cur_shared; - drv->bdrv_child_perm(bs, c, c->role, - cumulative_perms, cumulative_shared_perms, - &cur_perm, &cur_shared); + bdrv_child_perm(bs, c, c->role, + cumulative_perms, cumulative_shared_perms, + &cur_perm, &cur_shared); ret =3D bdrv_child_check_perm(c, cur_perm, cur_shared, ignore_chil= dren, errp); if (ret < 0) { @@ -1528,9 +1543,9 @@ static void bdrv_set_perm(BlockDriverState *bs, uint6= 4_t cumulative_perms, /* Update all children */ QLIST_FOREACH(c, &bs->children, next) { uint64_t cur_perm, cur_shared; - drv->bdrv_child_perm(bs, c, c->role, - cumulative_perms, cumulative_shared_perms, - &cur_perm, &cur_shared); + bdrv_child_perm(bs, c, c->role, + cumulative_perms, cumulative_shared_perms, + &cur_perm, &cur_shared); bdrv_child_set_perm(c, cur_perm, cur_shared); } } @@ -1865,8 +1880,8 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent= _bs, =20 assert(parent_bs->drv); assert(bdrv_get_aio_context(parent_bs) =3D=3D bdrv_get_aio_context(chi= ld_bs)); - parent_bs->drv->bdrv_child_perm(parent_bs, NULL, child_role, - perm, shared_perm, &perm, &shared_perm= ); + bdrv_child_perm(parent_bs, NULL, child_role, + perm, shared_perm, &perm, &shared_perm); =20 child =3D bdrv_root_attach_child(child_bs, child_name, child_role, perm, shared_perm, parent_bs, errp); --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747392844632.968810282289; Thu, 20 Apr 2017 21:03:12 -0700 (PDT) Received: from localhost ([::1]:57010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pmo-00031o-JB for importer@patchew.org; Fri, 21 Apr 2017 00:03:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgP-0005nr-GX for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgM-0003jT-C5 for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40940) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgG-0003hD-ON; Thu, 20 Apr 2017 23:56:24 -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 9603A3DBFE; Fri, 21 Apr 2017 03:56:23 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0445617966; Fri, 21 Apr 2017 03:56:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9603A3DBFE Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9603A3DBFE From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:50 +0800 Message-Id: <20170421035606.448-5-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.30]); Fri, 21 Apr 2017 03:56:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 04/20] qemu-img: Add --share-rw option to subcommands 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Similar to share-rw qdev property, this will force the opened images to allow shared write permission of other programs. Signed-off-by: Fam Zheng --- qemu-img.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++----------= ---- 1 file changed, 119 insertions(+), 36 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index ed24371..df88a79 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -28,6 +28,7 @@ #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qbool.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h" @@ -283,12 +284,15 @@ static int img_open_password(BlockBackend *blk, const= char *filename, =20 static BlockBackend *img_open_opts(const char *optstr, QemuOpts *opts, int flags, bool writeth= rough, - bool quiet) + bool quiet, bool share_rw) { QDict *options; Error *local_err =3D NULL; BlockBackend *blk; options =3D qemu_opts_to_qdict(opts, NULL); + if (share_rw) { + qdict_put(options, BDRV_OPT_FORCE_SHARED_WRITE, qbool_from_bool(tr= ue)); + } blk =3D blk_new_open(NULL, NULL, options, flags, &local_err); if (!blk) { error_reportf_err(local_err, "Could not open '%s': ", optstr); @@ -305,17 +309,19 @@ static BlockBackend *img_open_opts(const char *optstr, =20 static BlockBackend *img_open_file(const char *filename, const char *fmt, int flags, - bool writethrough, bool quiet) + bool writethrough, bool quiet, bool sha= re_rw) { BlockBackend *blk; Error *local_err =3D NULL; - QDict *options =3D NULL; + QDict *options =3D qdict_new(); =20 if (fmt) { - options =3D qdict_new(); qdict_put(options, "driver", qstring_from_str(fmt)); } =20 + if (share_rw) { + qdict_put(options, BDRV_OPT_FORCE_SHARED_WRITE, qbool_from_bool(tr= ue)); + } blk =3D blk_new_open(filename, NULL, options, flags, &local_err); if (!blk) { error_reportf_err(local_err, "Could not open '%s': ", filename); @@ -334,7 +340,7 @@ static BlockBackend *img_open_file(const char *filename, static BlockBackend *img_open(bool image_opts, const char *filename, const char *fmt, int flags, bool writethroug= h, - bool quiet) + bool quiet, bool share_rw) { BlockBackend *blk; if (image_opts) { @@ -348,9 +354,9 @@ static BlockBackend *img_open(bool image_opts, if (!opts) { return NULL; } - blk =3D img_open_opts(filename, opts, flags, writethrough, quiet); + blk =3D img_open_opts(filename, opts, flags, writethrough, quiet, = share_rw); } else { - blk =3D img_open_file(filename, fmt, flags, writethrough, quiet); + blk =3D img_open_file(filename, fmt, flags, writethrough, quiet, s= hare_rw); } return blk; } @@ -650,6 +656,7 @@ static int img_check(int argc, char **argv) ImageCheck *check; bool quiet =3D false; bool image_opts =3D false; + bool share_rw =3D false; =20 fmt =3D NULL; output =3D NULL; @@ -664,9 +671,10 @@ static int img_check(int argc, char **argv) {"output", required_argument, 0, OPTION_OUTPUT}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":hf:r:T:q", + c =3D getopt_long(argc, argv, ":hf:r:T:qU", long_options, &option_index); if (c =3D=3D -1) { break; @@ -705,6 +713,9 @@ static int img_check(int argc, char **argv) case 'q': quiet =3D true; break; + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts =3D qemu_opts_parse_noisily(&qemu_object_opts, @@ -744,7 +755,8 @@ static int img_check(int argc, char **argv) return 1; } =20 - blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet= ); + blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet, + share_rw); if (!blk) { return 1; } @@ -864,6 +876,7 @@ static int img_commit(int argc, char **argv) CommonBlockJobCBInfo cbi; bool image_opts =3D false; AioContext *aio_context; + bool share_rw =3D false; =20 fmt =3D NULL; cache =3D BDRV_DEFAULT_CACHE; @@ -873,9 +886,10 @@ static int img_commit(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":f:ht:b:dpq", + c =3D getopt_long(argc, argv, ":f:ht:b:dpqU", long_options, NULL); if (c =3D=3D -1) { break; @@ -910,6 +924,9 @@ static int img_commit(int argc, char **argv) case 'q': quiet =3D true; break; + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts =3D qemu_opts_parse_noisily(&qemu_object_opts, @@ -947,7 +964,8 @@ static int img_commit(int argc, char **argv) return 1; } =20 - blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet= ); + blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet, + share_rw); if (!blk) { return 1; } @@ -1206,6 +1224,7 @@ static int img_compare(int argc, char **argv) int c, pnum; uint64_t progress_base; bool image_opts =3D false; + bool share_rw =3D false; =20 cache =3D BDRV_DEFAULT_CACHE; for (;;) { @@ -1213,9 +1232,10 @@ static int img_compare(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":hf:F:T:pqs", + c =3D getopt_long(argc, argv, ":hf:F:T:pqsU", long_options, NULL); if (c =3D=3D -1) { break; @@ -1248,6 +1268,9 @@ static int img_compare(int argc, char **argv) case 's': strict =3D true; break; + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts =3D qemu_opts_parse_noisily(&qemu_object_opts, @@ -1293,13 +1316,15 @@ static int img_compare(int argc, char **argv) goto out3; } =20 - blk1 =3D img_open(image_opts, filename1, fmt1, flags, writethrough, qu= iet); + blk1 =3D img_open(image_opts, filename1, fmt1, flags, writethrough, qu= iet, + share_rw); if (!blk1) { ret =3D 2; goto out3; } =20 - blk2 =3D img_open(image_opts, filename2, fmt2, flags, writethrough, qu= iet); + blk2 =3D img_open(image_opts, filename2, fmt2, flags, writethrough, qu= iet, + share_rw); if (!blk2) { ret =3D 2; goto out2; @@ -1934,6 +1959,7 @@ static int img_convert(int argc, char **argv) bool writethrough, src_writethrough, quiet =3D false, image_opts =3D f= alse, compress =3D false, skip_create =3D false, progress =3D false; int64_t ret =3D -EINVAL; + bool share_rw =3D false; =20 ImgConvertState s =3D (ImgConvertState) { /* Need at least 4k of zeros for sparse detection */ @@ -1948,9 +1974,10 @@ static int img_convert(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:W", + c =3D getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:WU", long_options, NULL); if (c =3D=3D -1) { break; @@ -2054,6 +2081,9 @@ static int img_convert(int argc, char **argv) case 'W': s.wr_in_order =3D false; break; + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: opts =3D qemu_opts_parse_noisily(&qemu_object_opts, optarg, true); @@ -2117,7 +2147,8 @@ static int img_convert(int argc, char **argv) =20 for (bs_i =3D 0; bs_i < s.src_num; bs_i++) { s.src[bs_i] =3D img_open(image_opts, argv[optind + bs_i], - fmt, src_flags, src_writethrough, quiet); + fmt, src_flags, src_writethrough, quiet, + share_rw); if (!s.src[bs_i]) { ret =3D -1; goto out; @@ -2262,7 +2293,8 @@ static int img_convert(int argc, char **argv) * the bdrv_create() call which takes different params. * Not critical right now, so fix can wait... */ - s.target =3D img_open_file(out_filename, out_fmt, flags, writethrough,= quiet); + s.target =3D img_open_file(out_filename, out_fmt, flags, writethrough,= quiet, + share_rw); if (!s.target) { ret =3D -1; goto out; @@ -2413,7 +2445,7 @@ static gboolean str_equal_func(gconstpointer a, gcons= tpointer b) static ImageInfoList *collect_image_info_list(bool image_opts, const char *filename, const char *fmt, - bool chain) + bool chain, bool share_rw) { ImageInfoList *head =3D NULL; ImageInfoList **last =3D &head; @@ -2436,7 +2468,8 @@ static ImageInfoList *collect_image_info_list(bool im= age_opts, g_hash_table_insert(filenames, (gpointer)filename, NULL); =20 blk =3D img_open(image_opts, filename, fmt, - BDRV_O_NO_BACKING | BDRV_O_NO_IO, false, false); + BDRV_O_NO_BACKING | BDRV_O_NO_IO, false, false, + share_rw); if (!blk) { goto err; } @@ -2488,6 +2521,7 @@ static int img_info(int argc, char **argv) const char *filename, *fmt, *output; ImageInfoList *list; bool image_opts =3D false; + bool share_rw =3D false; =20 fmt =3D NULL; output =3D NULL; @@ -2500,9 +2534,10 @@ static int img_info(int argc, char **argv) {"backing-chain", no_argument, 0, OPTION_BACKING_CHAIN}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":f:h", + c =3D getopt_long(argc, argv, ":f:hU", long_options, &option_index); if (c =3D=3D -1) { break; @@ -2520,6 +2555,9 @@ static int img_info(int argc, char **argv) case 'f': fmt =3D optarg; break; + case 'U': + share_rw =3D true; + break; case OPTION_OUTPUT: output =3D optarg; break; @@ -2559,7 +2597,8 @@ static int img_info(int argc, char **argv) return 1; } =20 - list =3D collect_image_info_list(image_opts, filename, fmt, chain); + list =3D collect_image_info_list(image_opts, filename, fmt, chain, + share_rw); if (!list) { return 1; } @@ -2705,6 +2744,7 @@ static int img_map(int argc, char **argv) MapEntry curr =3D { .length =3D 0 }, next; int ret =3D 0; bool image_opts =3D false; + bool share_rw =3D false; =20 fmt =3D NULL; output =3D NULL; @@ -2716,9 +2756,10 @@ static int img_map(int argc, char **argv) {"output", required_argument, 0, OPTION_OUTPUT}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":f:h", + c =3D getopt_long(argc, argv, ":f:hU", long_options, &option_index); if (c =3D=3D -1) { break; @@ -2736,6 +2777,9 @@ static int img_map(int argc, char **argv) case 'f': fmt =3D optarg; break; + case 'U': + share_rw =3D true; + break; case OPTION_OUTPUT: output =3D optarg; break; @@ -2772,7 +2816,7 @@ static int img_map(int argc, char **argv) return 1; } =20 - blk =3D img_open(image_opts, filename, fmt, 0, false, false); + blk =3D img_open(image_opts, filename, fmt, 0, false, false, share_rw); if (!blk) { return 1; } @@ -2835,6 +2879,7 @@ static int img_snapshot(int argc, char **argv) bool quiet =3D false; Error *err =3D NULL; bool image_opts =3D false; + bool share_rw =3D false; =20 bdrv_oflags =3D BDRV_O_RDWR; /* Parse commandline parameters */ @@ -2843,9 +2888,10 @@ static int img_snapshot(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":la:c:d:hq", + c =3D getopt_long(argc, argv, ":la:c:d:hqU", long_options, NULL); if (c =3D=3D -1) { break; @@ -2895,6 +2941,9 @@ static int img_snapshot(int argc, char **argv) case 'q': quiet =3D true; break; + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts =3D qemu_opts_parse_noisily(&qemu_object_opts, @@ -2921,7 +2970,8 @@ static int img_snapshot(int argc, char **argv) } =20 /* Open the image */ - blk =3D img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet= ); + blk =3D img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet, + share_rw); if (!blk) { return 1; } @@ -2985,6 +3035,7 @@ static int img_rebase(int argc, char **argv) int c, flags, src_flags, ret; bool writethrough, src_writethrough; int unsafe =3D 0; + bool share_rw =3D 0; int progress =3D 0; bool quiet =3D false; Error *local_err =3D NULL; @@ -3001,9 +3052,10 @@ static int img_rebase(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":hf:F:b:upt:T:q", + c =3D getopt_long(argc, argv, ":hf:F:b:upt:T:qU", long_options, NULL); if (c =3D=3D -1) { break; @@ -3053,6 +3105,9 @@ static int img_rebase(int argc, char **argv) case OPTION_IMAGE_OPTS: image_opts =3D true; break; + case 'U': + share_rw =3D true; + break; } } =20 @@ -3101,7 +3156,8 @@ static int img_rebase(int argc, char **argv) * Ignore the old backing file for unsafe rebase in case we want to co= rrect * the reference to a renamed or moved backing file. */ - blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet= ); + blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet, + share_rw); if (!blk) { ret =3D -1; goto out; @@ -3126,6 +3182,9 @@ static int img_rebase(int argc, char **argv) qdict_put(options, "driver", qstring_from_str(bs->backing_form= at)); } =20 + if (share_rw) { + qdict_put(options, BDRV_OPT_FORCE_SHARED_WRITE, qbool_from_boo= l(true)); + } bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name)); blk_old_backing =3D blk_new_open(backing_name, NULL, options, src_flags, &local_err); @@ -3341,6 +3400,7 @@ static int img_resize(int argc, char **argv) bool quiet =3D false; BlockBackend *blk =3D NULL; QemuOpts *param; + bool share_rw =3D false; =20 static QemuOptsList resize_options =3D { .name =3D "resize_options", @@ -3373,9 +3433,10 @@ static int img_resize(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":f:hq", + c =3D getopt_long(argc, argv, ":f:hqU", long_options, NULL); if (c =3D=3D -1) { break; @@ -3396,6 +3457,9 @@ static int img_resize(int argc, char **argv) case 'q': quiet =3D true; break; + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts =3D qemu_opts_parse_noisily(&qemu_object_opts, @@ -3448,7 +3512,8 @@ static int img_resize(int argc, char **argv) qemu_opts_del(param); =20 blk =3D img_open(image_opts, filename, fmt, - BDRV_O_RDWR | BDRV_O_RESIZE, false, quiet); + BDRV_O_RDWR | BDRV_O_RESIZE, false, quiet, + share_rw); if (!blk) { ret =3D -1; goto out; @@ -3509,6 +3574,7 @@ static int img_amend(int argc, char **argv) BlockBackend *blk =3D NULL; BlockDriverState *bs =3D NULL; bool image_opts =3D false; + bool share_rw =3D false; =20 cache =3D BDRV_DEFAULT_CACHE; for (;;) { @@ -3516,9 +3582,10 @@ static int img_amend(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":ho:f:t:pq", + c =3D getopt_long(argc, argv, ":ho:f:t:pqU", long_options, NULL); if (c =3D=3D -1) { break; @@ -3560,6 +3627,9 @@ static int img_amend(int argc, char **argv) case 'q': quiet =3D true; break; + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: opts =3D qemu_opts_parse_noisily(&qemu_object_opts, optarg, true); @@ -3611,7 +3681,8 @@ static int img_amend(int argc, char **argv) goto out; } =20 - blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet= ); + blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet, + share_rw); if (!blk) { ret =3D -1; goto out; @@ -3779,6 +3850,7 @@ static int img_bench(int argc, char **argv) bool writethrough =3D false; struct timeval t1, t2; int i; + bool share_rw =3D false; =20 for (;;) { static const struct option long_options[] =3D { @@ -3787,9 +3859,10 @@ static int img_bench(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {"pattern", required_argument, 0, OPTION_PATTERN}, {"no-drain", no_argument, 0, OPTION_NO_DRAIN}, + {"share-rw", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:w", long_options,= NULL); + c =3D getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:wU", long_options= , NULL); if (c =3D=3D -1) { break; } @@ -3883,6 +3956,9 @@ static int img_bench(int argc, char **argv) flags |=3D BDRV_O_RDWR; is_write =3D true; break; + case 'U': + share_rw =3D true; + break; case OPTION_PATTERN: { unsigned long res; @@ -3930,7 +4006,8 @@ static int img_bench(int argc, char **argv) goto out; } =20 - blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet= ); + blk =3D img_open(image_opts, filename, fmt, flags, writethrough, quiet, + share_rw); if (!blk) { ret =3D -1; goto out; @@ -4097,6 +4174,7 @@ static int img_dd(int argc, char **argv) const char *fmt =3D NULL; int64_t size =3D 0; int64_t block_count =3D 0, out_pos, in_pos; + bool share_rw =3D false; struct DdInfo dd =3D { .flags =3D 0, .count =3D 0, @@ -4125,10 +4203,11 @@ static int img_dd(int argc, char **argv) const struct option long_options[] =3D { { "help", no_argument, 0, 'h'}, { "image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + { "share-rw", no_argument, 0, 'U'}, { 0, 0, 0, 0 } }; =20 - while ((c =3D getopt_long(argc, argv, ":hf:O:", long_options, NULL))) { + while ((c =3D getopt_long(argc, argv, ":hf:O:U", long_options, NULL)))= { if (c =3D=3D EOF) { break; } @@ -4148,6 +4227,9 @@ static int img_dd(int argc, char **argv) case 'h': help(); break; + case 'U': + share_rw =3D true; + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -4192,7 +4274,8 @@ static int img_dd(int argc, char **argv) ret =3D -1; goto out; } - blk1 =3D img_open(image_opts, in.filename, fmt, 0, false, false); + blk1 =3D img_open(image_opts, in.filename, fmt, 0, false, false, + share_rw); =20 if (!blk1) { ret =3D -1; @@ -4260,7 +4343,7 @@ static int img_dd(int argc, char **argv) } =20 blk2 =3D img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR, - false, false); + false, false, share_rw); =20 if (!blk2) { ret =3D -1; --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747253892738.6019338014746; Thu, 20 Apr 2017 21:00:53 -0700 (PDT) Received: from localhost ([::1]:56989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pka-000103-8c for importer@patchew.org; Fri, 21 Apr 2017 00:00:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgP-0005nt-Gi for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgN-0003ju-CW for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54740) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgJ-0003iD-M7; Thu, 20 Apr 2017 23:56:27 -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 8440880495; Fri, 21 Apr 2017 03:56:26 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EA8617966; Fri, 21 Apr 2017 03:56:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8440880495 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8440880495 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:51 +0800 Message-Id: <20170421035606.448-6-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.28]); Fri, 21 Apr 2017 03:56:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 05/20] qemu-img: Update documentation for --share-rw 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng --- qemu-img-cmds.hx | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 8ac7822..1b00bb8 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -10,15 +10,15 @@ STEXI ETEXI =20 DEF("bench", img_bench, - "bench [-c count] [-d depth] [-f fmt] [--flush-interval=3Dflush_interv= al] [-n] [--no-drain] [-o offset] [--pattern=3Dpattern] [-q] [-s buffer_siz= e] [-S step_size] [-t cache] [-w] filename") + "bench [-c count] [-d depth] [-f fmt] [--flush-interval=3Dflush_interv= al] [-n] [--no-drain] [-o offset] [--pattern=3Dpattern] [-q] [-s buffer_siz= e] [-S step_size] [-t cache] [-w] [--share-rw] filename") STEXI -@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [--flush-inte= rval=3D@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] [--pattern= =3D@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var= {cache}] [-w] @var{filename} +@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [--flush-inte= rval=3D@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] [--pattern= =3D@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var= {cache}] [-w] [--share-rw] @var{filename} ETEXI =20 DEF("check", img_check, - "check [-q] [--object objectdef] [--image-opts] [-f fmt] [--output=3Do= fmt] [-r [leaks | all]] [-T src_cache] filename") + "check [-q] [--object objectdef] [--image-opts] [-f fmt] [--output=3Do= fmt] [-r [leaks | all]] [-T src_cache] [--share-rw] filename") STEXI -@item check [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}] = [--output=3D@var{ofmt}] [-r [leaks | all]] [-T @var{src_cache}] @var{filena= me} +@item check [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}] = [--output=3D@var{ofmt}] [-r [leaks | all]] [-T @var{src_cache}] [--share-rw= ] @var{filename} ETEXI =20 DEF("create", img_create, @@ -28,62 +28,62 @@ STEXI ETEXI =20 DEF("commit", img_commit, - "commit [-q] [--object objectdef] [--image-opts] [-f fmt] [-t cache] [= -b base] [-d] [-p] filename") + "commit [-q] [--object objectdef] [--image-opts] [-f fmt] [-t cache] [= -b base] [-d] [-p] [--share-rw] filename") STEXI -@item commit [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}]= [-t @var{cache}] [-b @var{base}] [-d] [-p] @var{filename} +@item commit [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}]= [-t @var{cache}] [-b @var{base}] [-d] [-p] [--share-rw] @var{filename} ETEXI =20 DEF("compare", img_compare, - "compare [--object objectdef] [--image-opts] [-f fmt] [-F fmt] [-T src= _cache] [-p] [-q] [-s] filename1 filename2") + "compare [--object objectdef] [--image-opts] [-f fmt] [-F fmt] [-T src= _cache] [-p] [-q] [-s] [--share-rw] filename1 filename2") STEXI -@item compare [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [-F= @var{fmt}] [-T @var{src_cache}] [-p] [-q] [-s] @var{filename1} @var{filena= me2} +@item compare [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [-F= @var{fmt}] [-T @var{src_cache}] [-p] [-q] [-s] [--share-rw] @var{filename1= } @var{filename2} ETEXI =20 DEF("convert", img_convert, - "convert [--object objectdef] [--image-opts] [-c] [-p] [-q] [-n] [-f f= mt] [-t cache] [-T src_cache] [-O output_fmt] [-o options] [-s snapshot_id_= or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] file= name [filename2 [...]] output_filename") + "convert [--object objectdef] [--image-opts] [-c] [-p] [-q] [-n] [-f f= mt] [-t cache] [-T src_cache] [-O output_fmt] [-o options] [-s snapshot_id_= or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] [--s= hare-rw] filename [filename2 [...]] output_filename") STEXI -@item convert [--object @var{objectdef}] [--image-opts] [-c] [-p] [-q] [-n= ] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}= ] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param= }] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@v= ar{filename2} [...]] @var{output_filename} +@item convert [--object @var{objectdef}] [--image-opts] [-c] [-p] [-q] [-n= ] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}= ] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param= }] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] [--share-rw] @var{= filename} [@var{filename2} [...]] @var{output_filename} ETEXI =20 DEF("dd", img_dd, - "dd [--image-opts] [-f fmt] [-O output_fmt] [bs=3Dblock_size] [count= =3Dblocks] [skip=3Dblocks] if=3Dinput of=3Doutput") + "dd [--image-opts] [--share-rw] [-f fmt] [-O output_fmt] [bs=3Dblock_s= ize] [count=3Dblocks] [skip=3Dblocks] if=3Dinput of=3Doutput") STEXI -@item dd [--image-opts] [-f @var{fmt}] [-O @var{output_fmt}] [bs=3D@var{bl= ock_size}] [count=3D@var{blocks}] [skip=3D@var{blocks}] if=3D@var{input} of= =3D@var{output} +@item dd [--image-opts] [--share-rw] [-f @var{fmt}] [-O @var{output_fmt}] = [bs=3D@var{block_size}] [count=3D@var{blocks}] [skip=3D@var{blocks}] if=3D@= var{input} of=3D@var{output} ETEXI =20 DEF("info", img_info, - "info [--object objectdef] [--image-opts] [-f fmt] [--output=3Dofmt] [= --backing-chain] filename") + "info [--object objectdef] [--image-opts] [-f fmt] [--output=3Dofmt] [= --backing-chain] [--share-rw] filename") STEXI -@item info [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--out= put=3D@var{ofmt}] [--backing-chain] @var{filename} +@item info [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--out= put=3D@var{ofmt}] [--backing-chain] [--share-rw] @var{filename} ETEXI =20 DEF("map", img_map, - "map [--object objectdef] [--image-opts] [-f fmt] [--output=3Dofmt] fi= lename") + "map [--object objectdef] [--image-opts] [-f fmt] [--output=3Dofmt] [-= -share-rw] filename") STEXI -@item map [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--outp= ut=3D@var{ofmt}] @var{filename} +@item map [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--outp= ut=3D@var{ofmt}] [--share-rw] @var{filename} ETEXI =20 DEF("snapshot", img_snapshot, - "snapshot [--object objectdef] [--image-opts] [-q] [-l | -a snapshot |= -c snapshot | -d snapshot] filename") + "snapshot [--object objectdef] [--image-opts] [--share-rw] [-q] [-l | = -a snapshot | -c snapshot | -d snapshot] filename") STEXI -@item snapshot [--object @var{objectdef}] [--image-opts] [-q] [-l | -a @va= r{snapshot} | -c @var{snapshot} | -d @var{snapshot}] @var{filename} +@item snapshot [--object @var{objectdef}] [--image-opts] [--share-rw] [-q]= [-l | -a @var{snapshot} | -c @var{snapshot} | -d @var{snapshot}] @var{file= name} ETEXI =20 DEF("rebase", img_rebase, - "rebase [--object objectdef] [--image-opts] [-q] [-f fmt] [-t cache] [= -T src_cache] [-p] [-u] -b backing_file [-F backing_fmt] filename") + "rebase [--object objectdef] [--image-opts] [--share-rw] [-q] [-f fmt]= [-t cache] [-T src_cache] [-p] [-u] -b backing_file [-F backing_fmt] filen= ame") STEXI -@item rebase [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}]= [-t @var{cache}] [-T @var{src_cache}] [-p] [-u] -b @var{backing_file} [-F = @var{backing_fmt}] @var{filename} +@item rebase [--object @var{objectdef}] [--image-opts] [--share-rw] [-q] [= -f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-p] [-u] -b @var{backi= ng_file} [-F @var{backing_fmt}] @var{filename} ETEXI =20 DEF("resize", img_resize, - "resize [--object objectdef] [--image-opts] [-q] filename [+ | -]size") + "resize [--object objectdef] [--image-opts] [--share-rw] [-q] filename= [+ | -]size") STEXI -@item resize [--object @var{objectdef}] [--image-opts] [-q] @var{filename}= [+ | -]@var{size} +@item resize [--object @var{objectdef}] [--image-opts] [--share-rw] [-q] @= var{filename} [+ | -]@var{size} ETEXI =20 DEF("amend", img_amend, - "amend [--object objectdef] [--image-opts] [-p] [-q] [-f fmt] [-t cach= e] -o options filename") + "amend [--object objectdef] [--image-opts] [--share-rw] [-p] [-q] [-f = fmt] [-t cache] -o options filename") STEXI -@item amend [--object @var{objectdef}] [--image-opts] [-p] [-q] [-f @var{f= mt}] [-t @var{cache}] -o @var{options} @var{filename} +@item amend [--object @var{objectdef}] [--image-opts] [--share-rw] [-p] [-= q] [-f @var{fmt}] [-t @var{cache}] -o @var{options} @var{filename} @end table ETEXI --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747105236990.8670564879287; Thu, 20 Apr 2017 20:58:25 -0700 (PDT) Received: from localhost ([::1]:56973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PiB-0007Ju-TO for importer@patchew.org; Thu, 20 Apr 2017 23:58:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgS-0005rL-Dz for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgR-0003n1-CZ for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39718) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgM-0003jI-Fv; Thu, 20 Apr 2017 23:56:30 -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 62D972D8EB2; Fri, 21 Apr 2017 03:56:29 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2621B17966; Fri, 21 Apr 2017 03:56:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 62D972D8EB2 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 62D972D8EB2 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:52 +0800 Message-Id: <20170421035606.448-7-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.38]); Fri, 21 Apr 2017 03:56:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 06/20] qemu-io: Add --share-rw option 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add --share-rw/-U to program options and -U to open subcommand. Signed-off-by: Fam Zheng Reviewed-by: Kevin Wolf --- qemu-io.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 427cbae..c4d824f 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -20,6 +20,7 @@ #include "qemu/readline.h" #include "qemu/log.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qbool.h" #include "qom/object_interfaces.h" #include "sysemu/block-backend.h" #include "block/block_int.h" @@ -53,7 +54,8 @@ static const cmdinfo_t close_cmd =3D { .oneline =3D "close the current open file", }; =20 -static int openfile(char *name, int flags, bool writethrough, QDict *opts) +static int openfile(char *name, int flags, bool writethrough, bool share_r= w, + QDict *opts) { Error *local_err =3D NULL; BlockDriverState *bs; @@ -64,6 +66,12 @@ static int openfile(char *name, int flags, bool writethr= ough, QDict *opts) return 1; } =20 + if (share_rw) { + if (!opts) { + opts =3D qdict_new(); + } + qdict_put(opts, BDRV_OPT_FORCE_SHARED_WRITE, qbool_from_bool(true)= ); + } qemuio_blk =3D blk_new_open(name, NULL, opts, flags, &local_err); if (!qemuio_blk) { error_reportf_err(local_err, "can't open%s%s: ", @@ -108,6 +116,7 @@ static void open_help(void) " -r, -- open file read-only\n" " -s, -- use snapshot file\n" " -n, -- disable host cache, short for -t none\n" +" -U, -- allow shared write, don't lock image\n" " -k, -- use kernel AIO implementation (on Linux only)\n" " -t, -- use the given cache mode for the image\n" " -d, -- use the given discard mode for the image\n" @@ -124,7 +133,7 @@ static const cmdinfo_t open_cmd =3D { .argmin =3D 1, .argmax =3D -1, .flags =3D CMD_NOFILE_OK, - .args =3D "[-rsnk] [-t cache] [-d discard] [-o options] [path]", + .args =3D "[-rsnkU] [-t cache] [-d discard] [-o options] [path]", .oneline =3D "open the file specified by path", .help =3D open_help, }; @@ -147,8 +156,9 @@ static int open_f(BlockBackend *blk, int argc, char **a= rgv) int c; QemuOpts *qopts; QDict *opts; + bool share_rw =3D false; =20 - while ((c =3D getopt(argc, argv, "snro:kt:d:")) !=3D -1) { + while ((c =3D getopt(argc, argv, "snro:kt:d:U")) !=3D -1) { switch (c) { case 's': flags |=3D BDRV_O_SNAPSHOT; @@ -188,6 +198,9 @@ static int open_f(BlockBackend *blk, int argc, char **a= rgv) return 0; } break; + case 'U': + share_rw =3D true; + break; default: qemu_opts_reset(&empty_opts); return qemuio_command_usage(&open_cmd); @@ -211,9 +224,9 @@ static int open_f(BlockBackend *blk, int argc, char **a= rgv) qemu_opts_reset(&empty_opts); =20 if (optind =3D=3D argc - 1) { - return openfile(argv[optind], flags, writethrough, opts); + return openfile(argv[optind], flags, writethrough, share_rw, opts); } else if (optind =3D=3D argc) { - return openfile(NULL, flags, writethrough, opts); + return openfile(NULL, flags, writethrough, share_rw, opts); } else { QDECREF(opts); return qemuio_command_usage(&open_cmd); @@ -257,6 +270,7 @@ static void usage(const char *name) " -T, --trace [[enable=3D]][,events=3D][,file=3D]\n" " specify tracing options\n" " see qemu-img(1) man page for full description\n" +" -U, --share-rw allow shared write\n" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" "\n" @@ -436,7 +450,7 @@ static QemuOptsList file_opts =3D { int main(int argc, char **argv) { int readonly =3D 0; - const char *sopt =3D "hVc:d:f:rsnmkt:T:"; + const char *sopt =3D "hVc:d:f:rsnmkt:T:U"; const struct option lopt[] =3D { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, @@ -452,6 +466,7 @@ int main(int argc, char **argv) { "trace", required_argument, NULL, 'T' }, { "object", required_argument, NULL, OPTION_OBJECT }, { "image-opts", no_argument, NULL, OPTION_IMAGE_OPTS }, + { "share-rw", no_argument, 0, 'U'}, { NULL, 0, NULL, 0 } }; int c; @@ -462,6 +477,7 @@ int main(int argc, char **argv) QDict *opts =3D NULL; const char *format =3D NULL; char *trace_file =3D NULL; + bool share_rw =3D false; =20 #ifdef CONFIG_POSIX signal(SIGPIPE, SIG_IGN); @@ -524,6 +540,9 @@ int main(int argc, char **argv) case 'h': usage(progname); exit(0); + case 'U': + share_rw =3D true; + break; case OPTION_OBJECT: { QemuOpts *qopts; qopts =3D qemu_opts_parse_noisily(&qemu_object_opts, @@ -595,7 +614,7 @@ int main(int argc, char **argv) exit(1); } opts =3D qemu_opts_to_qdict(qopts, NULL); - if (openfile(NULL, flags, writethrough, opts)) { + if (openfile(NULL, flags, writethrough, share_rw, opts)) { exit(1); } } else { @@ -603,7 +622,7 @@ int main(int argc, char **argv) opts =3D qdict_new(); qdict_put(opts, "driver", qstring_from_str(format)); } - if (openfile(argv[optind], flags, writethrough, opts)) { + if (openfile(argv[optind], flags, writethrough, share_rw, opts= )) { exit(1); } } --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747250070161.1716960504939; Thu, 20 Apr 2017 21:00:50 -0700 (PDT) Received: from localhost ([::1]:56988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PkW-0000y2-Go for importer@patchew.org; Fri, 21 Apr 2017 00:00:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgT-0005sU-JW for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgS-0003nd-Jq for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42136) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgP-0003l9-Q9; Thu, 20 Apr 2017 23:56:34 -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 A7D108E231; Fri, 21 Apr 2017 03:56:32 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 076A017966; Fri, 21 Apr 2017 03:56:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A7D108E231 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A7D108E231 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:53 +0800 Message-Id: <20170421035606.448-8-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.26]); Fri, 21 Apr 2017 03:56:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 07/20] iotests: 030: Prepare for image locking 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qemu-img and qemu-io commands when guest is running need "-U" option, add it. Signed-off-by: Fam Zheng --- tests/qemu-iotests/030 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 0d472d5..5f1dce8 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -63,8 +63,8 @@ class TestSingleDrive(iotests.QMPTestCase): def test_stream_intermediate(self): self.assert_no_active_block_jobs() =20 - self.assertNotEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img), - qemu_io('-f', iotests.imgfmt, '-c', 'map', mid= _img), + self.assertNotEqual(qemu_io('-f', 'raw', '-rU', '-c', 'map', backi= ng_img), + qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'ma= p', mid_img), 'image file map matches backing file before st= reaming') =20 result =3D self.vm.qmp('block-stream', device=3D'mid', job_id=3D's= tream-mid') @@ -114,7 +114,7 @@ class TestSingleDrive(iotests.QMPTestCase): self.assert_no_active_block_jobs() =20 # The image map is empty before the operation - empty_map =3D qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img) + empty_map =3D qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', te= st_img) =20 # This is a no-op: no data should ever be copied from the base ima= ge result =3D self.vm.qmp('block-stream', device=3D'drive0', base=3Dm= id_img) @@ -125,7 +125,7 @@ class TestSingleDrive(iotests.QMPTestCase): self.assert_no_active_block_jobs() self.vm.shutdown() =20 - self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', test_i= mg), + self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', '-r', = test_img), empty_map, 'image file map changed after a no-op') =20 def test_stream_partial(self): @@ -197,8 +197,8 @@ class TestParallelOps(iotests.QMPTestCase): =20 # Check that the maps don't match before the streaming operations for i in range(2, self.num_imgs, 2): - self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map',= self.imgs[i]), - qemu_io('-f', iotests.imgfmt, '-c', 'map',= self.imgs[i-1]), + self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', = 'map', self.imgs[i]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', = 'map', self.imgs[i-1]), 'image file map matches backing file befor= e streaming') =20 # Create all streaming jobs @@ -351,8 +351,8 @@ class TestParallelOps(iotests.QMPTestCase): def test_stream_base_node_name(self): self.assert_no_active_block_jobs() =20 - self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.imgs[4]), - qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.imgs[3]), + self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.imgs[4]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.imgs[3]), 'image file map matches backing file before st= reaming') =20 # Error: the base node does not exist @@ -422,8 +422,8 @@ class TestQuorum(iotests.QMPTestCase): if not iotests.supports_quorum(): return =20 - self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.children[0]), - qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.backing[0]), + self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.children[0]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.backing[0]), 'image file map matches backing file before st= reaming') =20 self.assert_no_active_block_jobs() @@ -436,8 +436,8 @@ class TestQuorum(iotests.QMPTestCase): self.assert_no_active_block_jobs() self.vm.shutdown() =20 - self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', self.c= hildren[0]), - qemu_io('-f', iotests.imgfmt, '-c', 'map', self.b= acking[0]), + self.assertEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map', = self.children[0]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map', = self.backing[0]), 'image file map does not match backing file after= streaming') =20 class TestSmallerBackingFile(iotests.QMPTestCase): --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747253446267.6733681295742; Thu, 20 Apr 2017 21:00:53 -0700 (PDT) Received: from localhost ([::1]:56990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pka-00010B-49 for importer@patchew.org; Fri, 21 Apr 2017 00:00:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgV-0005v7-Gf for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgU-0003oU-JB for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42722) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgS-0003nG-Lo; Thu, 20 Apr 2017 23:56:36 -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 8827DC054C5A; Fri, 21 Apr 2017 03:56:35 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B45B17966; Fri, 21 Apr 2017 03:56:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8827DC054C5A Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8827DC054C5A From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:54 +0800 Message-Id: <20170421035606.448-9-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.32]); Fri, 21 Apr 2017 03:56:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 08/20] iotests: 046: Prepare for image locking 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The qemu-img info command is executed while VM is running, add -U option to avoid the image locking error. Signed-off-by: Fam Zheng --- tests/qemu-iotests/046 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index e528b67..f2ebecf 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -192,7 +192,7 @@ echo "=3D=3D Verify image content =3D=3D" =20 function verify_io() { - if ($QEMU_IMG info -f "$IMGFMT" "$TEST_IMG" | grep "compat: 0.10" > /d= ev/null); then + if ($QEMU_IMG info -U -f "$IMGFMT" "$TEST_IMG" | grep "compat: 0.10" >= /dev/null); then # For v2 images, discarded clusters are read from the backing file # Keep the variable empty so that the backing file value can be us= ed as # the default below --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747603514380.78867382791066; Thu, 20 Apr 2017 21:06:43 -0700 (PDT) Received: from localhost ([::1]:57028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PqE-0005tW-3A for importer@patchew.org; Fri, 21 Apr 2017 00:06:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgb-00060p-5W for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pga-0003rF-4K for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34476) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgV-0003ob-Ja; Thu, 20 Apr 2017 23:56:39 -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 7F86B8AE7D; Fri, 21 Apr 2017 03:56:38 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41B0317966; Fri, 21 Apr 2017 03:56:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7F86B8AE7D Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7F86B8AE7D From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:55 +0800 Message-Id: <20170421035606.448-10-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.27]); Fri, 21 Apr 2017 03:56:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 09/20] iotests: 055: Don't attach the target image already for drive-backup 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Double attach is not a valid usage of the target image, drive-backup will open the blockdev itself so skip the add_drive call in this case. Signed-off-by: Fam Zheng Reviewed-by: Max Reitz --- tests/qemu-iotests/055 | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 index aafcd24..ba4da65 100755 --- a/tests/qemu-iotests/055 +++ b/tests/qemu-iotests/055 @@ -458,17 +458,18 @@ class TestDriveCompression(iotests.QMPTestCase): except OSError: pass =20 - def do_prepare_drives(self, fmt, args): + def do_prepare_drives(self, fmt, args, attach_target): self.vm =3D iotests.VM().add_drive(test_img) =20 qemu_img('create', '-f', fmt, blockdev_target_img, str(TestDriveCompression.image_len), *args) - self.vm.add_drive(blockdev_target_img, format=3Dfmt, interface=3D"= none") + if attach_target: + self.vm.add_drive(blockdev_target_img, format=3Dfmt, interface= =3D"none") =20 self.vm.launch() =20 - def do_test_compress_complete(self, cmd, format, **args): - self.do_prepare_drives(format['type'], format['args']) + def do_test_compress_complete(self, cmd, format, attach_target, **args= ): + self.do_prepare_drives(format['type'], format['args'], attach_targ= et) =20 self.assert_no_active_block_jobs() =20 @@ -484,15 +485,16 @@ class TestDriveCompression(iotests.QMPTestCase): =20 def test_complete_compress_drive_backup(self): for format in TestDriveCompression.fmt_supports_compression: - self.do_test_compress_complete('drive-backup', format, + self.do_test_compress_complete('drive-backup', format, False, target=3Dblockdev_target_img, m= ode=3D'existing') =20 def test_complete_compress_blockdev_backup(self): for format in TestDriveCompression.fmt_supports_compression: - self.do_test_compress_complete('blockdev-backup', format, targ= et=3D'drive1') + self.do_test_compress_complete('blockdev-backup', format, True, + target=3D'drive1') =20 - def do_test_compress_cancel(self, cmd, format, **args): - self.do_prepare_drives(format['type'], format['args']) + def do_test_compress_cancel(self, cmd, format, attach_target, **args): + self.do_prepare_drives(format['type'], format['args'], attach_targ= et) =20 self.assert_no_active_block_jobs() =20 @@ -506,15 +508,16 @@ class TestDriveCompression(iotests.QMPTestCase): =20 def test_compress_cancel_drive_backup(self): for format in TestDriveCompression.fmt_supports_compression: - self.do_test_compress_cancel('drive-backup', format, + self.do_test_compress_cancel('drive-backup', format, False, target=3Dblockdev_target_img, mod= e=3D'existing') =20 def test_compress_cancel_blockdev_backup(self): for format in TestDriveCompression.fmt_supports_compression: - self.do_test_compress_cancel('blockdev-backup', format, target= =3D'drive1') + self.do_test_compress_cancel('blockdev-backup', format, True, + target=3D'drive1') =20 - def do_test_compress_pause(self, cmd, format, **args): - self.do_prepare_drives(format['type'], format['args']) + def do_test_compress_pause(self, cmd, format, attach_target, **args): + self.do_prepare_drives(format['type'], format['args'], attach_targ= et) =20 self.assert_no_active_block_jobs() =20 @@ -546,12 +549,13 @@ class TestDriveCompression(iotests.QMPTestCase): =20 def test_compress_pause_drive_backup(self): for format in TestDriveCompression.fmt_supports_compression: - self.do_test_compress_pause('drive-backup', format, + self.do_test_compress_pause('drive-backup', format, False, target=3Dblockdev_target_img, mode= =3D'existing') =20 def test_compress_pause_blockdev_backup(self): for format in TestDriveCompression.fmt_supports_compression: - self.do_test_compress_pause('blockdev-backup', format, target= =3D'drive1') + self.do_test_compress_pause('blockdev-backup', format, True, + target=3D'drive1') =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['raw', 'qcow2']) --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149274740826565.63049251907864; Thu, 20 Apr 2017 21:03:28 -0700 (PDT) Received: from localhost ([::1]:57011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pn5-0003G9-0I for importer@patchew.org; Fri, 21 Apr 2017 00:03:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgd-00062Q-Fs for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgc-0003sS-F7 for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53876) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgY-0003ph-Dt; Thu, 20 Apr 2017 23:56:42 -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 46762C04BD2B; Fri, 21 Apr 2017 03:56:41 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20E4D17966; Fri, 21 Apr 2017 03:56:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 46762C04BD2B Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 46762C04BD2B From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:56 +0800 Message-Id: <20170421035606.448-11-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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, 21 Apr 2017 03:56:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 10/20] iotests: 085: Avoid image locking conflict 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In the case where we test the expected error when a blockdev-snapshot target already has a backing image, the backing chain is opened multiple times. This will be a problem when we use image locking, so use a different backing file that is not already open. Signed-off-by: Fam Zheng --- tests/qemu-iotests/085 | 34 ++++++++++++++++++++-------------- tests/qemu-iotests/085.out | 3 ++- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index c53e97f..cc6efd8 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -45,7 +45,7 @@ _cleanup() rm -f "${TEST_DIR}/${i}-${snapshot_virt0}" rm -f "${TEST_DIR}/${i}-${snapshot_virt1}" done - rm -f "${TEST_IMG}.1" "${TEST_IMG}.2" + rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base" =20 } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -87,24 +87,26 @@ function create_group_snapshot() } =20 # ${1}: unique identifier for the snapshot filename -# ${2}: true: open backing images; false: don't open them (default) +# ${2}: extra_params to the blockdev-add command +# ${3}: filename +function do_blockdev_add() +{ + cmd=3D"{ 'execute': 'blockdev-add', 'arguments': + { 'driver': 'qcow2', 'node-name': 'snap_${1}', ${2} + 'file': + { 'driver': 'file', 'filename': '${3}', + 'node-name': 'file_${1}' } } }" + _send_qemu_cmd $h "${cmd}" "return" +} + +# ${1}: unique identifier for the snapshot filename function add_snapshot_image() { - if [ "${2}" =3D "true" ]; then - extra_params=3D"" - else - extra_params=3D"'backing': '', " - fi base_image=3D"${TEST_DIR}/$((${1}-1))-${snapshot_virt0}" snapshot_file=3D"${TEST_DIR}/${1}-${snapshot_virt0}" _make_test_img -b "${base_image}" "$size" mv "${TEST_IMG}" "${snapshot_file}" - cmd=3D"{ 'execute': 'blockdev-add', 'arguments': - { 'driver': 'qcow2', 'node-name': 'snap_${1}', ${extra_params} - 'file': - { 'driver': 'file', 'filename': '${snapshot_file}', - 'node-name': 'file_${1}' } } }" - _send_qemu_cmd $h "${cmd}" "return" + do_blockdev_add "$1" "'backing': '', " "${snapshot_file}" } =20 # ${1}: unique identifier for the snapshot filename @@ -222,7 +224,11 @@ echo =3D=3D=3D Invalid command - snapshot node has a b= acking image =3D=3D=3D echo =20 SNAPSHOTS=3D$((${SNAPSHOTS}+1)) -add_snapshot_image ${SNAPSHOTS} true + +_make_test_img "$size" +mv "${TEST_IMG}" "${TEST_IMG}.base" +_make_test_img -b "${TEST_IMG}.base" "$size" +do_blockdev_add ${SNAPSHOTS} "" "${TEST_IMG}" blockdev_snapshot ${SNAPSHOTS} error =20 echo diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out index 182acb4..65b0f68 100644 --- a/tests/qemu-iotests/085.out +++ b/tests/qemu-iotests/085.out @@ -78,7 +78,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D13421= 7728 backing_file=3DTEST_DIR/ =20 =3D=3D=3D Invalid command - snapshot node has a backing image =3D=3D=3D =20 -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 backing_file= =3DTEST_DIR/12-snapshot-v0.IMGFMT +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 backing_file= =3DTEST_DIR/t.IMGFMT.base {"return": {}} {"error": {"class": "GenericError", "desc": "The snapshot already has a ba= cking image"}} =20 --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747556936675.8734488727105; Thu, 20 Apr 2017 21:05:56 -0700 (PDT) Received: from localhost ([::1]:57026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PpT-0005J9-Db for importer@patchew.org; Fri, 21 Apr 2017 00:05:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pge-00063L-8F for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgd-0003t0-Hi for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33632) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pgb-0003ri-JN; Thu, 20 Apr 2017 23:56:45 -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 71DA29D0D7; Fri, 21 Apr 2017 03:56:44 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE95817966; Fri, 21 Apr 2017 03:56:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 71DA29D0D7 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 71DA29D0D7 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:57 +0800 Message-Id: <20170421035606.448-12-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.39]); Fri, 21 Apr 2017 03:56:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 11/20] iotests: 087: Don't attach test image twice 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The test scenario doesn't require the same image, instead it focuses on the duplicated node-name, so use null-co to avoid locking conflict. Reviewed-by: Max Reitz Signed-off-by: Fam Zheng --- tests/qemu-iotests/087 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index 9de57dd..6d52f7d 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -82,8 +82,7 @@ run_qemu -drive driver=3D$IMGFMT,id=3Ddisk,node-name=3Dte= st-node,file=3D"$TEST_IMG" < Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14927477155762.8976710924531517; Thu, 20 Apr 2017 21:08:35 -0700 (PDT) Received: from localhost ([::1]:57046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Ps2-0007jm-5s for importer@patchew.org; Fri, 21 Apr 2017 00:08:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgj-00067Z-Un for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgj-0003ww-6c for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41226) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pge-0003tL-Nq; Thu, 20 Apr 2017 23:56:48 -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 9938D3F20F; Fri, 21 Apr 2017 03:56:47 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44CCB17966; Fri, 21 Apr 2017 03:56:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9938D3F20F Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9938D3F20F From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:58 +0800 Message-Id: <20170421035606.448-13-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.30]); Fri, 21 Apr 2017 03:56:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 12/20] iotests: 091: Quit QEMU before checking image 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng Reviewed-by: Max Reitz --- tests/qemu-iotests/091 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 32bbd56..10ac4a8 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -95,7 +95,9 @@ echo "vm2: qemu process running successfully" echo "vm2: flush io, and quit" _send_qemu_cmd $h2 'qemu-io disk flush' "(qemu)" _send_qemu_cmd $h2 'quit' "" +_send_qemu_cmd $h1 'quit' "" =20 +wait echo "Check image pattern" ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filte= r_qemu_io =20 --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747466875585.1180948003777; Thu, 20 Apr 2017 21:04:26 -0700 (PDT) Received: from localhost ([::1]:57014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Po1-00041C-9u for importer@patchew.org; Fri, 21 Apr 2017 00:04:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgq-0006GN-Fi for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgn-00040Q-DA for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pgi-0003vb-2P; Thu, 20 Apr 2017 23:56:52 -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 E67399090F; Fri, 21 Apr 2017 03:56:50 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82C1F17966; Fri, 21 Apr 2017 03:56:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E67399090F Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E67399090F From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:59 +0800 Message-Id: <20170421035606.448-14-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.29]); Fri, 21 Apr 2017 03:56:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 13/20] iotests: 172: Use separate images for multiple devices 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To avoid image lock failures. Signed-off-by: Fam Zheng --- tests/qemu-iotests/172 | 55 +++++++++++++++++++++++++-----------------= ---- tests/qemu-iotests/172.out | 50 +++++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 1b7d3a1..826d6fe 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -30,6 +30,8 @@ status=3D1 # failure is the default! _cleanup() { _cleanup_test_img + rm -f "$TEST_IMG.2" + rm -f "$TEST_IMG.3" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -86,6 +88,9 @@ size=3D720k =20 _make_test_img $size =20 +TEST_IMG=3D"$TEST_IMG.2" _make_test_img $size +TEST_IMG=3D"$TEST_IMG.3" _make_test_img $size + # Default drive semantics: # # By default you get a single empty floppy drive. You can override it with @@ -105,7 +110,7 @@ echo =3D=3D=3D Using -fda/-fdb options =3D=3D=3D =20 check_floppy_qtree -fda "$TEST_IMG" check_floppy_qtree -fdb "$TEST_IMG" -check_floppy_qtree -fda "$TEST_IMG" -fdb "$TEST_IMG" +check_floppy_qtree -fda "$TEST_IMG" -fdb "$TEST_IMG.2" =20 =20 echo @@ -114,7 +119,7 @@ echo =3D=3D=3D Using -drive options =3D=3D=3D =20 check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG",index=3D1 -check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dflopp= y,file=3D"$TEST_IMG",index=3D1 +check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dflopp= y,file=3D"$TEST_IMG.2",index=3D1 =20 echo echo @@ -122,7 +127,7 @@ echo =3D=3D=3D Using -drive if=3Dnone and -global =3D= =3D=3D =20 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -global isa-fdc.dri= veA=3Dnone0 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -global isa-fdc.dri= veB=3Dnone0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global isa-fdc.driveA=3Dnone0 -global isa-fdc.driveB= =3Dnone1 =20 echo @@ -131,7 +136,7 @@ echo =3D=3D=3D Using -drive if=3Dnone and -device =3D= =3D=3D =20 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -device floppy,driv= e=3Dnone0 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -device floppy,driv= e=3Dnone0,unit=3D1 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -device floppy,drive=3Dnone0 -device floppy,drive=3Dnon= e1,unit=3D1 =20 echo @@ -139,58 +144,58 @@ echo echo =3D=3D=3D Mixing -fdX and -global =3D=3D=3D =20 # Working -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -g= lobal isa-fdc.driveB=3Dnone0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -g= lobal isa-fdc.driveA=3Dnone0 +check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveB=3Dnone0 +check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveA=3Dnone0 =20 # Conflicting (-fdX wins) -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -g= lobal isa-fdc.driveA=3Dnone0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -g= lobal isa-fdc.driveB=3Dnone0 +check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveA=3Dnone0 +check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveB=3Dnone0 =20 echo echo echo =3D=3D=3D Mixing -fdX and -device =3D=3D=3D =20 # Working -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -d= evice floppy,drive=3Dnone0 -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -d= evice floppy,drive=3Dnone0,unit=3D1 +check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -device floppy,drive=3Dnone0 +check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -device floppy,drive=3Dnone0,unit=3D1 =20 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -d= evice floppy,drive=3Dnone0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -d= evice floppy,drive=3Dnone0,unit=3D0 +check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -device floppy,drive=3Dnone0 +check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -device floppy,drive=3Dnone0,unit=3D0 =20 # Conflicting -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -d= evice floppy,drive=3Dnone0,unit=3D0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG" -d= evice floppy,drive=3Dnone0,unit=3D1 +check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -device floppy,drive=3Dnone0,unit=3D0 +check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -device floppy,drive=3Dnone0,unit=3D1 =20 echo echo echo =3D=3D=3D Mixing -drive and -device =3D=3D=3D =20 # Working -check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dnone,= file=3D"$TEST_IMG" -device floppy,drive=3Dnone0 -check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dnone,= file=3D"$TEST_IMG" -device floppy,drive=3Dnone0,unit=3D1 +check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dnone,= file=3D"$TEST_IMG.2" -device floppy,drive=3Dnone0 +check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dnone,= file=3D"$TEST_IMG.2" -device floppy,drive=3Dnone0,unit=3D1 =20 # Conflicting -check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dnone,= file=3D"$TEST_IMG" -device floppy,drive=3Dnone0,unit=3D0 +check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dnone,= file=3D"$TEST_IMG.2" -device floppy,drive=3Dnone0,unit=3D0 =20 echo echo echo =3D=3D=3D Mixing -global and -device =3D=3D=3D =20 # Working -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D1 =20 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D0 =20 # Conflicting -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG" \ +check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D1 =20 echo @@ -199,8 +204,8 @@ echo =3D=3D=3D Too many floppy drives =3D=3D=3D =20 # Working check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" \ - -drive if=3Dnone,file=3D"$TEST_IMG" \ - -drive if=3Dnone,file=3D"$TEST_IMG" \ + -drive if=3Dnone,file=3D"$TEST_IMG.2" \ + -drive if=3Dnone,file=3D"$TEST_IMG.3" \ -global isa-fdc.driveB=3Dnone0 \ -device floppy,drive=3Dnone1 =20 diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 54b5329..2732966 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -1,5 +1,7 @@ QA output created by 172 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D737280 +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=3DIMGFMT size=3D737280 +Formatting 'TEST_DIR/t.IMGFMT.3', fmt=3DIMGFMT size=3D737280 =20 =20 =3D=3D=3D Default =3D=3D=3D @@ -99,7 +101,7 @@ Testing: -fdb TEST_DIR/t.qcow2 share-rw =3D false drive-type =3D "288" =20 -Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2 +Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -205,7 +207,7 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 share-rw =3D false drive-type =3D "288" =20 -Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dfloppy,fil= e=3DTEST_DIR/t.qcow2,index=3D1 +Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dfloppy,fil= e=3DTEST_DIR/t.qcow2.2,index=3D1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -300,7 +302,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -glob= al isa-fdc.driveB=3Dnone0 share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa-fdc.driveA=3Dnone0 -global isa-fdc.driveB=3Dno= ne1 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -global isa-fdc.driveB=3D= none1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -395,7 +397,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0,unit=3D1 share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -device floppy,drive=3Dnone0 -device floppy,drive=3Dnone1,= unit=3D1 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -436,7 +438,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco =20 =3D=3D=3D Mixing -fdX and -global =3D=3D=3D =20 -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -g= lobal isa-fdc.driveB=3Dnone0 +Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveB=3Dnone0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -474,7 +476,7 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa- share-rw =3D false drive-type =3D "144" =20 -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -g= lobal isa-fdc.driveA=3Dnone0 +Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveA=3Dnone0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -512,7 +514,7 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa- share-rw =3D false drive-type =3D "144" =20 -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -g= lobal isa-fdc.driveA=3Dnone0 +Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveA=3Dnone0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -539,7 +541,7 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa- share-rw =3D false drive-type =3D "144" =20 -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -g= lobal isa-fdc.driveB=3Dnone0 +Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveB=3Dnone0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -569,7 +571,7 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa- =20 =3D=3D=3D Mixing -fdX and -device =3D=3D=3D =20 -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -d= evice floppy,drive=3Dnone0 +Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -607,7 +609,7 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -device flop share-rw =3D false drive-type =3D "144" =20 -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -d= evice floppy,drive=3Dnone0,unit=3D1 +Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0,unit=3D1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -645,7 +647,7 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -device flop share-rw =3D false drive-type =3D "144" =20 -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -d= evice floppy,drive=3Dnone0 +Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -683,7 +685,7 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -device flop share-rw =3D false drive-type =3D "144" =20 -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -d= evice floppy,drive=3Dnone0,unit=3D0 +Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0,unit=3D0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -721,18 +723,18 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2 -device flop share-rw =3D false drive-type =3D "144" =20 -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -d= evice floppy,drive=3Dnone0,unit=3D0 +Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: Floppy unit 0 is in use QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: Device initialization fa= iled. =20 -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -d= evice floppy,drive=3Dnone0,unit=3D1 +Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0,unit=3D1 QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D1: Floppy unit 1 is in use QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D1: Device initialization fa= iled. =20 =20 =3D=3D=3D Mixing -drive and -device =3D=3D=3D =20 -Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2 -device floppy,drive=3Dnone0 +Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -770,7 +772,7 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.q share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2 -device floppy,drive=3Dnone0,unit=3D1 +Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0,unit=3D1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -808,14 +810,14 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -= drive if=3Dnone,file=3DTEST_DIR/t.q share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2 -device floppy,drive=3Dnone0,unit=3D0 +Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: Floppy unit 0 is in use QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: Device initialization fa= iled. =20 =20 =3D=3D=3D Mixing -global and -device =3D=3D=3D =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dnone1 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -853,7 +855,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D1 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -891,7 +893,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dnone1 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -929,7 +931,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D0 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) @@ -967,18 +969,18 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.qco share-rw =3D false drive-type =3D "144" =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D0 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D0: Floppy unit 0 is in use QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D0: Device initialization fa= iled. =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D1 +Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D1 QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D1: Floppy unit 1 is in use QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D1: Device initialization fa= iled. =20 =20 =3D=3D=3D Too many floppy drives =3D=3D=3D =20 -Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -global isa-fd= c.driveB=3Dnone0 -device floppy,drive=3Dnone1 +Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.3 -global is= a-fdc.driveB=3Dnone0 -device floppy,drive=3Dnone1 QEMU_PROG: -device floppy,drive=3Dnone1: Can't create floppy unit 2, bus s= upports only 2 units QEMU_PROG: -device floppy,drive=3Dnone1: Device initialization failed. =20 --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747694034477.08914631526966; Thu, 20 Apr 2017 21:08:14 -0700 (PDT) Received: from localhost ([::1]:57044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Prg-0007Ue-K2 for importer@patchew.org; Fri, 21 Apr 2017 00:08:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgq-0006GK-FJ for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgn-00040X-JW for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42313) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pgk-0003y1-Sq; Thu, 20 Apr 2017 23:56:55 -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 BDB8590228; Fri, 21 Apr 2017 03:56:53 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77BFF17966; Fri, 21 Apr 2017 03:56:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BDB8590228 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BDB8590228 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:56:00 +0800 Message-Id: <20170421035606.448-15-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.26]); Fri, 21 Apr 2017 03:56:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 14/20] tests: Use null-co:// instead of /dev/null as the dummy image 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng Reviewed-by: Max Reitz --- tests/drive_del-test.c | 2 +- tests/nvme-test.c | 2 +- tests/usb-hcd-uhci-test.c | 2 +- tests/usb-hcd-xhci-test.c | 2 +- tests/virtio-blk-test.c | 2 +- tests/virtio-scsi-test.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index 121b9c9..2175139 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -92,7 +92,7 @@ static void test_after_failed_device_add(void) static void test_drive_del_device_del(void) { /* Start with a drive used by a device that unplugs instantaneously */ - qtest_start("-drive if=3Dnone,id=3Ddrive0,file=3D/dev/null,format=3Dra= w" + qtest_start("-drive if=3Dnone,id=3Ddrive0,file=3Dnull-co://,format=3Dr= aw" " -device virtio-scsi-pci" " -device scsi-hd,drive=3Ddrive0,id=3Ddev0"); =20 diff --git a/tests/nvme-test.c b/tests/nvme-test.c index c8bece4..7674a44 100644 --- a/tests/nvme-test.c +++ b/tests/nvme-test.c @@ -22,7 +22,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); qtest_add_func("/nvme/nop", nop); =20 - qtest_start("-drive id=3Ddrv0,if=3Dnone,file=3D/dev/null,format=3Draw " + qtest_start("-drive id=3Ddrv0,if=3Dnone,file=3Dnull-co://,format=3Draw= " "-device nvme,drive=3Ddrv0,serial=3Dfoo"); ret =3D g_test_run(); =20 diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c index f25bae5..5b500fe 100644 --- a/tests/usb-hcd-uhci-test.c +++ b/tests/usb-hcd-uhci-test.c @@ -79,7 +79,7 @@ int main(int argc, char **argv) { const char *arch =3D qtest_get_arch(); const char *cmd =3D "-device piix3-usb-uhci,id=3Duhci,addr=3D1d.0" - " -drive id=3Ddrive0,if=3Dnone,file=3D/dev/null,form= at=3Draw" + " -drive id=3Ddrive0,if=3Dnone,file=3Dnull-co://,for= mat=3Draw" " -device usb-tablet,bus=3Duhci.0,port=3D1"; int ret; =20 diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c index 22513e9..031764d 100644 --- a/tests/usb-hcd-xhci-test.c +++ b/tests/usb-hcd-xhci-test.c @@ -89,7 +89,7 @@ int main(int argc, char **argv) qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug); =20 qtest_start("-device nec-usb-xhci,id=3Dxhci" - " -drive id=3Ddrive0,if=3Dnone,file=3D/dev/null,format=3Dr= aw"); + " -drive id=3Ddrive0,if=3Dnone,file=3Dnull-co://,format=3D= raw"); ret =3D g_test_run(); qtest_end(); =20 diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 1eee95d..fd2078c 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -63,7 +63,7 @@ static QOSState *pci_test_start(void) const char *arch =3D qtest_get_arch(); char *tmp_path; const char *cmd =3D "-drive if=3Dnone,id=3Ddrive0,file=3D%s,format=3Dr= aw " - "-drive if=3Dnone,id=3Ddrive1,file=3D/dev/null,forma= t=3Draw " + "-drive if=3Dnone,id=3Ddrive1,file=3Dnull-co://,form= at=3Draw " "-device virtio-blk-pci,id=3Ddrv0,drive=3Ddrive0," "addr=3D%x.%x"; =20 diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 0eabd56..5e2ff14 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -35,7 +35,7 @@ typedef struct { static QOSState *qvirtio_scsi_start(const char *extra_opts) { const char *arch =3D qtest_get_arch(); - const char *cmd =3D "-drive id=3Ddrv0,if=3Dnone,file=3D/dev/null,forma= t=3Draw " + const char *cmd =3D "-drive id=3Ddrv0,if=3Dnone,file=3Dnull-co://,form= at=3Draw " "-device virtio-scsi-pci,id=3Dvs0 " "-device scsi-hd,bus=3Dvs0.0,drive=3Ddrv0 %s"; =20 @@ -195,7 +195,7 @@ static void hotplug(void) QDict *response; QOSState *qs; =20 - qs =3D qvirtio_scsi_start("-drive id=3Ddrv1,if=3Dnone,file=3D/dev/null= ,format=3Draw"); + qs =3D qvirtio_scsi_start("-drive id=3Ddrv1,if=3Dnone,file=3Dnull-co:/= /,format=3Draw"); response =3D qmp("{\"execute\": \"device_add\"," " \"arguments\": {" " \"driver\": \"scsi-hd\"," --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747805258592.4095802762223; Thu, 20 Apr 2017 21:10:05 -0700 (PDT) Received: from localhost ([::1]:57050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PtT-0000Jh-VJ for importer@patchew.org; Fri, 21 Apr 2017 00:10:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgs-0006K7-DQ for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgr-00042b-Jw for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40066) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pgn-00040H-Qw; Thu, 20 Apr 2017 23:56:57 -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 B619765CE0; Fri, 21 Apr 2017 03:56:56 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 484BF80B3B; Fri, 21 Apr 2017 03:56:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B619765CE0 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B619765CE0 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:56:01 +0800 Message-Id: <20170421035606.448-16-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.38]); Fri, 21 Apr 2017 03:56:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 15/20] file-posix: Add 'locking' option 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Making this option available even before implementing it will let converting tests easier: in coming patches they can specify the option already when necessary, before we actually write code to lock the images. Signed-off-by: Fam Zheng --- block/file-posix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index ade71db..2114720 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -392,6 +392,11 @@ static QemuOptsList raw_runtime_opts =3D { .type =3D QEMU_OPT_STRING, .help =3D "host AIO implementation (threads, native)", }, + { + .name =3D "locking", + .type =3D QEMU_OPT_BOOL, + .help =3D "lock the file", + }, { /* end of list */ } }, }; --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747421508777.2771482422235; Thu, 20 Apr 2017 21:03:41 -0700 (PDT) Received: from localhost ([::1]:57012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PnH-0003QG-VP for importer@patchew.org; Fri, 21 Apr 2017 00:03:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgt-0006N0-PM for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgs-00043E-UN for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53998) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pgq-00041r-O2; Thu, 20 Apr 2017 23:57:00 -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 99E25C04BD38; Fri, 21 Apr 2017 03:56:59 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5923C17966; Fri, 21 Apr 2017 03:56:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 99E25C04BD38 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 99E25C04BD38 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:56:02 +0800 Message-Id: <20170421035606.448-17-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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, 21 Apr 2017 03:56:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 16/20] tests: Disable image lock in test-replication 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The COLO block replication architecture requires one disk to be shared between primary and secondary, in the test both processes use posix file protocol (instead of over NBD) so it is affected by image locking. Disable the lock. Signed-off-by: Fam Zheng --- tests/test-replication.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/test-replication.c b/tests/test-replication.c index fac2da3..e1c4235 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -179,7 +179,8 @@ static BlockBackend *start_primary(void) char *cmdline; =20 cmdline =3D g_strdup_printf("driver=3Dreplication,mode=3Dprimary,node-= name=3Dxxx," - "file.driver=3Dqcow2,file.file.filename=3D%s" + "file.driver=3Dqcow2,file.file.filename=3D%s= ," + "file.file.locking=3Doff" , p_local_disk); opts =3D qemu_opts_parse_noisily(&qemu_drive_opts, cmdline, false); g_free(cmdline); @@ -310,7 +311,9 @@ static BlockBackend *start_secondary(void) Error *local_err =3D NULL; =20 /* add s_local_disk and forge S_LOCAL_DISK_ID */ - cmdline =3D g_strdup_printf("file.filename=3D%s,driver=3Dqcow2", s_loc= al_disk); + cmdline =3D g_strdup_printf("file.filename=3D%s,driver=3Dqcow2," + "file.locking=3Doff", + s_local_disk); opts =3D qemu_opts_parse_noisily(&qemu_drive_opts, cmdline, false); g_free(cmdline); =20 @@ -331,8 +334,10 @@ static BlockBackend *start_secondary(void) /* add S_(ACTIVE/HIDDEN)_DISK and forge S_ID */ cmdline =3D g_strdup_printf("driver=3Dreplication,mode=3Dsecondary,top= -id=3D%s," "file.driver=3Dqcow2,file.file.filename=3D%s= ," + "file.file.locking=3Doff," "file.backing.driver=3Dqcow2," "file.backing.file.filename=3D%s," + "file.backing.file.locking=3Doff," "file.backing.backing=3D%s" , S_ID, s_active_disk, s_hidden_disk , S_LOCAL_DISK_ID); --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747784464122.24918985761235; Thu, 20 Apr 2017 21:09:44 -0700 (PDT) Received: from localhost ([::1]:57049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pt8-0008V1-Iu for importer@patchew.org; Fri, 21 Apr 2017 00:09:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pgz-0006Sm-2V for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Pgw-00046Z-0k for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pgt-00043I-M1; Thu, 20 Apr 2017 23:57:03 -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 8E7C33DBE1; Fri, 21 Apr 2017 03:57:02 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3841317966; Fri, 21 Apr 2017 03:56:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8E7C33DBE1 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8E7C33DBE1 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:56:03 +0800 Message-Id: <20170421035606.448-18-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.30]); Fri, 21 Apr 2017 03:57:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 17/20] block: Reuse bs as backing hd for drive-backup sync=none 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng --- blockdev.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 4927914..4e04dec 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3174,6 +3174,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup,= BlockJobTxn *txn, Error *local_err =3D NULL; int flags; int64_t size; + bool set_backing_hd =3D false; =20 if (!backup->has_speed) { backup->speed =3D 0; @@ -3224,6 +3225,8 @@ static BlockJob *do_drive_backup(DriveBackup *backup,= BlockJobTxn *txn, } if (backup->sync =3D=3D MIRROR_SYNC_MODE_NONE) { source =3D bs; + flags |=3D BDRV_O_NO_BACKING; + set_backing_hd =3D true; } =20 size =3D bdrv_getlength(bs); @@ -3250,7 +3253,9 @@ static BlockJob *do_drive_backup(DriveBackup *backup,= BlockJobTxn *txn, } =20 if (backup->format) { - options =3D qdict_new(); + if (!options) { + options =3D qdict_new(); + } qdict_put(options, "driver", qstring_from_str(backup->format)); } =20 @@ -3261,6 +3266,14 @@ static BlockJob *do_drive_backup(DriveBackup *backup= , BlockJobTxn *txn, =20 bdrv_set_aio_context(target_bs, aio_context); =20 + if (set_backing_hd) { + bdrv_set_backing_hd(target_bs, source, &local_err); + if (local_err) { + bdrv_unref(target_bs); + goto out; + } + } + if (backup->has_bitmap) { bmap =3D bdrv_find_dirty_bitmap(bs, backup->bitmap); if (!bmap) { --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747625308297.02934357889285; Thu, 20 Apr 2017 21:07:05 -0700 (PDT) Received: from localhost ([::1]:57030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PqZ-0006Ea-UN for importer@patchew.org; Fri, 21 Apr 2017 00:07:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Ph1-0006W0-HP for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Ph0-00049u-LN for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55032) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Pgw-00046K-EA; Thu, 20 Apr 2017 23:57:06 -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 5423775EAE; Fri, 21 Apr 2017 03:57:05 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3299F17966; Fri, 21 Apr 2017 03:57:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5423775EAE Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5423775EAE From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:56:04 +0800 Message-Id: <20170421035606.448-19-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.28]); Fri, 21 Apr 2017 03:57:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 18/20] osdep: Add qemu_lock_fd and qemu_unlock_fd 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" They are wrappers of POSIX fcntl "file private locking", with a convenient "try lock" wrapper implemented with F_OFD_GETLK. Signed-off-by: Fam Zheng Reviewed-by: Max Reitz --- include/qemu/osdep.h | 3 +++ util/osdep.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 122ff06..1c9f5e2 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -341,6 +341,9 @@ int qemu_close(int fd); #ifndef _WIN32 int qemu_dup(int fd); #endif +int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive); +int qemu_unlock_fd(int fd, int64_t start, int64_t len); +int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive); =20 #if defined(__HAIKU__) && defined(__i386__) #define FMT_pid "%ld" diff --git a/util/osdep.c b/util/osdep.c index 06fb1cf..3de4a18 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -140,6 +140,54 @@ static int qemu_parse_fdset(const char *param) { return qemu_parse_fd(param); } + +static int qemu_lock_fcntl(int fd, int64_t start, int64_t len, int fl_type) +{ +#ifdef F_OFD_SETLK + int ret; + struct flock fl =3D { + .l_whence =3D SEEK_SET, + .l_start =3D start, + .l_len =3D len, + .l_type =3D fl_type, + }; + ret =3D fcntl(fd, F_OFD_SETLK, &fl); + return ret =3D=3D -1 ? -errno : 0; +#else + return -ENOTSUP; +#endif +} + +int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive) +{ + return qemu_lock_fcntl(fd, start, len, exclusive ? F_WRLCK : F_RDLCK); +} + +int qemu_unlock_fd(int fd, int64_t start, int64_t len) +{ + return qemu_lock_fcntl(fd, start, len, F_UNLCK); +} + +int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive) +{ +#ifdef F_OFD_SETLK + int ret; + struct flock fl =3D { + .l_whence =3D SEEK_SET, + .l_start =3D start, + .l_len =3D len, + .l_type =3D exclusive ? F_WRLCK : F_RDLCK, + }; + ret =3D fcntl(fd, F_OFD_GETLK, &fl); + if (ret =3D=3D -1) { + return -errno; + } else { + return fl.l_type =3D=3D F_UNLCK ? 0 : -EAGAIN; + } +#else + return -ENOTSUP; +#endif +} #endif =20 /* --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747583875919.7277432165486; Thu, 20 Apr 2017 21:06:23 -0700 (PDT) Received: from localhost ([::1]:57027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Ppu-0005ey-79 for importer@patchew.org; Fri, 21 Apr 2017 00:06:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Ph9-0006dA-8w for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Ph6-0004C3-66 for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64351) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Ph0-00049P-C2; Thu, 20 Apr 2017 23:57:10 -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 45B5A9D0D7; Fri, 21 Apr 2017 03:57:09 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24F5980B3B; Fri, 21 Apr 2017 03:57:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 45B5A9D0D7 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 45B5A9D0D7 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:56:05 +0800 Message-Id: <20170421035606.448-20-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.39]); Fri, 21 Apr 2017 03:57:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 19/20] file-posix: Add image locking in perm operations 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" virtlockd in libvirt locks the first byte, so we start looking at the file bytes from 0x10. The complication is in the transactional interface. To make the reopen logic managable, and allow better reuse, the code is internally organized with a table from old mode to the new one. Signed-off-by: Fam Zheng --- block/file-posix.c | 739 +++++++++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 736 insertions(+), 3 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 2114720..c307493 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -129,8 +129,54 @@ do { \ =20 #define MAX_BLOCKSIZE 4096 =20 +/* Posix file locking bytes. Libvirt takes byte 0, we start from byte 0x10, + * leaving a few more bytes for its future use. */ +#define RAW_LOCK_BYTE_MIN 0x10 +#define RAW_LOCK_BYTE_NO_OTHER_WRITER 0x10 +#define RAW_LOCK_BYTE_WRITE 0x11 +#ifdef F_OFD_SETLK +#define RAW_LOCK_SUPPORTED 1 +#else +#define RAW_LOCK_SUPPORTED 0 +#endif + +/* + ** reader that can tolerate writers: Don't do anything + * + ** reader that can't tolerate writers: Take shared lock on byte 0x10. Test + * byte 0x11 is unlocked. + * + ** shared writer: Take shared lock on byte 0x11. Test byte 0x10 is unlock= ed. + * + ** exclusive writer: Take exclusive locks on both bytes. + */ + +typedef enum { + /* Read only and accept other writers. */ + RAW_L_READ_SHARE_RW, + /* Read only and try to forbid other writers. */ + RAW_L_READ, + /* Read/write and accept other writers. */ + RAW_L_WRITE_SHARE_RW, + /* Read/write and try to forbid other writers. */ + RAW_L_WRITE, +} BDRVRawLockMode; + +typedef struct BDRVRawLockUpdateState { + /* A dup of @fd used for acquiring lock. */ + int image_fd; + int lock_fd; + int open_flags; + BDRVRawLockMode new_lock; + bool use_lock; +} BDRVRawLockUpdateState; + typedef struct BDRVRawState { int fd; + /* A dup of @fd to make manipulating lock easier, especially during re= open, + * where this will accept BDRVRawReopenState.lock_fd. */ + int lock_fd; + bool use_lock; int type; int open_flags; size_t buf_align; @@ -145,6 +191,11 @@ typedef struct BDRVRawState { bool page_cache_inconsistent:1; bool has_fallocate; bool needs_alignment; + /* The current lock mode we are in. Note that in incoming migration th= is is + * the "desired" mode to be applied at bdrv_invalidate_cache. */ + BDRVRawLockMode cur_lock_mode; + /* Used by raw_check_perm/raw_set_perm. */ + BDRVRawLockUpdateState *lock_update; } BDRVRawState; =20 typedef struct BDRVRawReopenState { @@ -367,6 +418,59 @@ static void raw_parse_flags(int bdrv_flags, int *open_= flags) } } =20 +static int raw_lock_fd(int fd, BDRVRawLockMode mode, Error **errp) +{ + int ret; + assert(fd >=3D 0); + assert(RAW_LOCK_SUPPORTED); + switch (mode) { + case RAW_L_READ_SHARE_RW: + ret =3D qemu_unlock_fd(fd, RAW_LOCK_BYTE_MIN, 2); + if (ret) { + error_setg_errno(errp, -ret, "Failed to unlock fd"); + goto fail; + } + break; + case RAW_L_READ: + ret =3D qemu_lock_fd(fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1, false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock share byte"); + goto fail; + } + ret =3D qemu_lock_fd_test(fd, RAW_LOCK_BYTE_WRITE, 1, true); + if (ret) { + error_setg_errno(errp, -ret, "Write byte lock is taken"); + goto fail; + } + break; + case RAW_L_WRITE_SHARE_RW: + ret =3D qemu_lock_fd(fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock write byte"); + goto fail; + } + ret =3D qemu_lock_fd_test(fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1, tr= ue); + if (ret) { + error_setg_errno(errp, -ret, "Share byte lock is taken"); + goto fail; + } + break; + case RAW_L_WRITE: + ret =3D qemu_lock_fd(fd, RAW_LOCK_BYTE_MIN, 2, true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock image"); + goto fail; + } + break; + default: + abort(); + } + return 0; +fail: + qemu_unlock_fd(fd, RAW_LOCK_BYTE_MIN, 2); + return ret; +} + static void raw_parse_filename(const char *filename, QDict *options, Error **errp) { @@ -401,6 +505,23 @@ static QemuOptsList raw_runtime_opts =3D { }, }; =20 +static BDRVRawLockMode raw_get_lock_mode(bool write, bool shared) +{ + if (write) { + if (shared) { + return RAW_L_WRITE_SHARE_RW; + } else { + return RAW_L_WRITE; + } + } else { + if (shared) { + return RAW_L_READ_SHARE_RW; + } else { + return RAW_L_READ; + } + } +} + static int raw_open_common(BlockDriverState *bs, QDict *options, int bdrv_flags, int open_flags, Error **errp) { @@ -440,10 +561,13 @@ static int raw_open_common(BlockDriverState *bs, QDic= t *options, } s->use_linux_aio =3D (aio =3D=3D BLOCKDEV_AIO_OPTIONS_NATIVE); =20 + s->use_lock =3D qemu_opt_get_bool(opts, "locking", true); + s->open_flags =3D open_flags; raw_parse_flags(bdrv_flags, &s->open_flags); =20 s->fd =3D -1; + s->lock_fd =3D -1; fd =3D qemu_open(filename, s->open_flags, 0644); if (fd < 0) { ret =3D -errno; @@ -542,6 +666,509 @@ static int raw_open(BlockDriverState *bs, QDict *opti= ons, int flags, return raw_open_common(bs, options, flags, 0, errp); } =20 +typedef enum { + RAW_LT_PREPARE, + RAW_LT_COMMIT, + RAW_LT_ABORT +} RawLockTransOp; + +typedef int (*RawLockTransFunc)(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp); + +static int raw_lt_nop(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + assert(old_lock =3D=3D new_lock || new_lock =3D=3D RAW_L_READ_SHARE_RW= ); + return 0; +} + +static int raw_lt_from_unlock(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + assert(old_lock !=3D new_lock); + assert(old_lock =3D=3D RAW_L_READ_SHARE_RW); + switch (op) { + case RAW_LT_PREPARE: + return raw_lock_fd(new_lock_fd, new_lock, errp); + case RAW_LT_COMMIT: + break; + case RAW_LT_ABORT: + break; + } + + return 0; +} + +static int raw_lt_read_to_write_share(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + int ret =3D 0; + + assert(old_lock =3D=3D RAW_L_READ); + assert(new_lock =3D=3D RAW_L_WRITE_SHARE_RW); + + /* + * lock byte "no other writer" lock byte "write" + * old S 0 + * new 0 S + * + * (0 =3D unlocked; S =3D shared; X =3D exclusive.) + */ + switch (op) { + case RAW_LT_PREPARE: + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_WRITE, 1, true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock new fd (write byt= e)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock new fd (share byt= e)"); + break; + } + ret =3D qemu_unlock_fd(old_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER,= 1); + if (ret) { + error_setg_errno(errp, -ret, "Failed to unlock old fd (share b= yte)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to upgrade new fd (share = byte)"); + break; + } + ret =3D qemu_unlock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER,= 1); + if (ret) { + /* This is very unlikely, but catch it anyway. */ + error_setg_errno(errp, -ret, "Failed to unlock new fd (share b= yte)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to downgrade new fd (writ= e byte)"); + break; + } + break; + case RAW_LT_COMMIT: + break; + case RAW_LT_ABORT: + ret =3D qemu_lock_fd(old_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (ret) { + /* As unlikely as above unlock failure, but report it anyway. = */ + error_report("Failed to restore lock on old fd (share byte)"); + } + break; + } + return ret; +} + +static int raw_lt_read_to_write(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + int ret =3D 0; + + assert(old_lock =3D=3D RAW_L_READ); + assert(new_lock =3D=3D RAW_L_WRITE); + /* + * lock byte "no other writer" lock byte "write" + * old S 0 + * new X X + * + * (0 =3D unlocked; S =3D shared; X =3D exclusive.) + */ + switch (op) { + case RAW_LT_PREPARE: + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_WRITE, 1, true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock new fd (write byt= e)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock new fd (share byt= e)"); + break; + } + ret =3D qemu_unlock_fd(old_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER,= 1); + if (ret) { + error_setg_errno(errp, -ret, "Failed to unlock old fd (share b= yte)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to upgrade new fd (share = byte)"); + break; + } + break; + case RAW_LT_COMMIT: + break; + case RAW_LT_ABORT: + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to downgrade new fd (shar= e byte)"); + break; + } + ret =3D qemu_lock_fd(old_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (ret) { + error_report("Failed to restore lock on old fd (share byte)"); + } + break; + } + return ret; +} + +static int raw_lt_write_share_to_read(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + int ret =3D 0; + + assert(old_lock =3D=3D RAW_L_WRITE_SHARE_RW); + assert(new_lock =3D=3D RAW_L_READ); + /* + * lock byte "no other writer" lock byte "write" + * old 0 S + * new S 0 + * + * (0 =3D unlocked; S =3D shared; X =3D exclusive.) + */ + switch (op) { + case RAW_LT_PREPARE: + /* Make sure there are no other writers. */ + ret =3D qemu_lock_fd(old_lock_fd, RAW_LOCK_BYTE_WRITE, 1, true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock old fd (write byt= e)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (!ret) { + break; + } + error_setg_errno(errp, -ret, "Failed to lock new fd (share byte)"); + /* fall through */ + case RAW_LT_ABORT: + ret =3D qemu_lock_fd(old_lock_fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_report("Failed to downgrade old fd (write byte)"); + } + break; + case RAW_LT_COMMIT: + break; + } + return ret; +} + +static int raw_lt_write_share_to_write(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + int ret =3D 0; + + assert(old_lock =3D=3D RAW_L_WRITE_SHARE_RW); + assert(new_lock =3D=3D RAW_L_WRITE); + /* + * lock byte "no other writer" lock byte "write" + * old 0 S + * new X X + * + * (0 =3D unlocked; S =3D shared; X =3D exclusive.) + */ + switch (op) { + case RAW_LT_PREPARE: + /* Make sure there are no other writers. */ + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock new fd (share byt= e)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock new fd (write byt= e)"); + break; + } + ret =3D qemu_unlock_fd(old_lock_fd, RAW_LOCK_BYTE_WRITE, 1); + if (ret) { + error_setg_errno(errp, -ret, "Failed to unlock old fd (write b= yte)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_WRITE, 1, true); + if (ret) { + error_setg_errno(errp, -ret, "Failed to upgrade new fd (write = byte)"); + break; + } + break; + case RAW_LT_COMMIT: + break; + case RAW_LT_ABORT: + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to downgrade new fd (writ= e byte)"); + break; + } + ret =3D qemu_lock_fd(old_lock_fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to restore old fd (write = byte)"); + break; + } + break; + } + return ret; +} + +static int raw_lt_write_to_read(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + int ret =3D 0; + + assert(old_lock =3D=3D RAW_L_WRITE); + assert(new_lock =3D=3D RAW_L_READ); + /* + * lock byte "no other writer" lock byte "write" + * old X X + * new S 0 + * + * (0 =3D unlocked; S =3D shared; X =3D exclusive.) + */ + switch (op) { + case RAW_LT_PREPARE: + break; + case RAW_LT_COMMIT: + ret =3D qemu_lock_fd(old_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to downgrade old fd (shar= e byte)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_NO_OTHER_WRITER, 1= , false); + if (ret) { + error_setg_errno(errp, -ret, "Failed to lock new fd (share byt= e)"); + break; + } + break; + case RAW_LT_ABORT: + break; + } + return ret; +} + +static int raw_lt_write_to_write_share(RawLockTransOp op, + int old_lock_fd, int new_lock_fd, + BDRVRawLockMode old_lock, + BDRVRawLockMode new_lock, + Error **errp) +{ + int ret =3D 0; + + assert(old_lock =3D=3D RAW_L_WRITE); + assert(new_lock =3D=3D RAW_L_WRITE_SHARE_RW); + /* + * lock byte "no other writer" lock byte "write" + * old X X + * new 0 S + * + * (0 =3D unlocked; S =3D shared; X =3D exclusive.) + */ + switch (op) { + case RAW_LT_PREPARE: + break; + case RAW_LT_COMMIT: + ret =3D qemu_lock_fd(old_lock_fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_report("Failed to downgrade old fd (share byte)"); + break; + } + ret =3D qemu_lock_fd(new_lock_fd, RAW_LOCK_BYTE_WRITE, 1, false); + if (ret) { + error_report("Failed to lock new fd (write byte)"); + } + break; + case RAW_LT_ABORT: + break; + } + return ret; +} + +/** + * Transactionally moving between possible locking states is tricky and mu= st be + * done carefully. That is mostly because downgrading an exclusive lock to + * shared or unlocked is not guaranteed to be revertible. As a result, in = such + * cases we have to defer the downgrading to "commit", given that no rever= t will + * happen after that point, and that downgrading a lock should never fail. + * + * On the other hand, upgrading a lock (e.g. from unlocked or shared to + * exclusive lock) must happen in "prepare" because it may fail. + * + * Manage the operation matrix with this state transition table to make + * fulfilling above conditions easier. + */ +static const struct RawLockTransOp { + BDRVRawLockMode old_lock; + BDRVRawLockMode new_lock; + RawLockTransFunc func; + bool need_lock_fd; + bool close_old_lock_fd; +} raw_lock_trans_ops[] =3D { + + {RAW_L_READ_SHARE_RW, RAW_L_READ_SHARE_RW, raw_lt_nop, = false, false}, + {RAW_L_READ_SHARE_RW, RAW_L_READ, raw_lt_from_unlock, = true}, + {RAW_L_READ_SHARE_RW, RAW_L_WRITE_SHARE_RW, raw_lt_from_unlock, = true}, + {RAW_L_READ_SHARE_RW, RAW_L_WRITE, raw_lt_from_unlock, = true}, + + {RAW_L_READ, RAW_L_READ_SHARE_RW, raw_lt_nop, = false, true}, + {RAW_L_READ, RAW_L_READ, raw_lt_nop, = false, false}, + {RAW_L_READ, RAW_L_WRITE_SHARE_RW, raw_lt_read_to_write_shar= e, true}, + {RAW_L_READ, RAW_L_WRITE, raw_lt_read_to_write, = true}, + + {RAW_L_WRITE_SHARE_RW, RAW_L_READ_SHARE_RW, raw_lt_nop, = false, true}, + {RAW_L_WRITE_SHARE_RW, RAW_L_READ, raw_lt_write_share_to_rea= d, true}, + {RAW_L_WRITE_SHARE_RW, RAW_L_WRITE_SHARE_RW, raw_lt_nop, = false, false}, + {RAW_L_WRITE_SHARE_RW, RAW_L_WRITE, raw_lt_write_share_to_wri= te, true}, + + {RAW_L_WRITE, RAW_L_READ_SHARE_RW, raw_lt_nop, = false, true}, + {RAW_L_WRITE, RAW_L_READ, raw_lt_write_to_read, = true}, + {RAW_L_WRITE, RAW_L_WRITE_SHARE_RW, raw_lt_write_to_write_sha= re, true}, + {RAW_L_WRITE, RAW_L_WRITE, raw_lt_nop, = false, false}, +}; + +static int raw_handle_lock_update(BlockDriverState *bs, + RawLockTransOp op, + Error **errp) +{ + BDRVRawState *s =3D bs->opaque; + BDRVRawLockMode old_lock, new_lock; + const struct RawLockTransOp *rec; + int ret =3D 0; + Error *local_err =3D NULL; + BDRVRawLockUpdateState *lu =3D s->lock_update; + int lock_fd =3D -1; + + if (!RAW_LOCK_SUPPORTED) { + goto cleanup; + } + + if (bdrv_get_flags(bs) & BDRV_O_INACTIVE) { + /* leave the work to bdrv_invalidate_cache. */ + return 0; + } + + if (op =3D=3D RAW_LT_PREPARE) { + lock_fd =3D qemu_open(bs->filename, lu->open_flags); + if (lock_fd =3D=3D -1) { + if (errno =3D=3D ENOENT) { + /* The file is gone, probably BDRV_O_SNAPSHOT? Skip lockin= g. */ + lu->use_lock =3D false; + } else { + /* other errors handled later. */ + } + } + } + + old_lock =3D s->cur_lock_mode; + new_lock =3D lu->use_lock ? lu->new_lock : RAW_L_READ_SHARE_RW; + for (rec =3D &raw_lock_trans_ops[0]; + rec < &raw_lock_trans_ops[ARRAY_SIZE(raw_lock_trans_ops)]; + rec++) { + if (rec->old_lock =3D=3D old_lock && rec->new_lock =3D=3D new_lock= ) { + break; + } + } + assert(rec !=3D &raw_lock_trans_ops[ARRAY_SIZE(raw_lock_trans_ops)]); + + assert(old_lock =3D=3D RAW_L_READ_SHARE_RW || s->lock_fd >=3D 0); + + DPRINTF("handle lock %p old lock %d new lock %d op %d func %p\n", bs, + old_lock, new_lock, op, rec->func); + switch (op) { + case RAW_LT_PREPARE: + if (rec->need_lock_fd) { + if (lock_fd >=3D 0) { + lu->lock_fd =3D lock_fd; + } else { + error_setg(errp, "Failed to initialize lock fd"); + } + } else { + if (lock_fd >=3D 0) { + qemu_close(lock_fd); + lock_fd =3D -1; + } + } + ret =3D rec->func(op, s->lock_fd, lu->lock_fd, old_lock, new_lock,= errp); + if (!ret) { + break; + } + /* Only succeeded preparation will be reverted by block layer, we + * need to clean up this failure manually. */ + op =3D RAW_LT_ABORT; + /* fall through */ + case RAW_LT_ABORT: + rec->func(op, s->lock_fd, lu->lock_fd, old_lock, new_lock, &local_= err); + if (local_err) { + error_report_err(local_err); + } + if (lu->lock_fd >=3D 0) { + qemu_close(lu->lock_fd); + lu->lock_fd =3D -1; + } + goto cleanup; + case RAW_LT_COMMIT: + rec->func(op, s->lock_fd, lu->lock_fd, old_lock, new_lock, &error_= abort); + if ((rec->need_lock_fd || rec->close_old_lock_fd) && s->lock_fd >= =3D 0) { + raw_lock_fd(s->lock_fd, RAW_L_READ_SHARE_RW, NULL); + qemu_close(s->lock_fd); + s->lock_fd =3D -1; + } + if (rec->need_lock_fd) { + s->lock_fd =3D lu->lock_fd; + } + assert(s->lock_fd >=3D 0 || new_lock =3D=3D RAW_L_READ_SHARE_RW); + s->cur_lock_mode =3D new_lock; + s->use_lock =3D lu->use_lock; + goto cleanup; + } + return ret; +cleanup: + g_free(s->lock_update); + s->lock_update =3D NULL; + return ret; +} + +static void raw_init_lock_update(BlockDriverState *bs, + int image_fd, + bool write, bool shared, + bool use_lock) +{ + BDRVRawState *s =3D bs->opaque; + + assert(!s->lock_update); + s->lock_update =3D g_new0(BDRVRawLockUpdateState, 1); + *s->lock_update =3D (BDRVRawLockUpdateState) { + .image_fd =3D image_fd, + .new_lock =3D raw_get_lock_mode(write, shared), + .use_lock =3D use_lock, + .open_flags =3D (s->open_flags & ~(O_RDWR | O_RDONLY)) | + (write ? O_RDWR : O_RDONLY), + }; +} + static int raw_reopen_prepare(BDRVReopenState *state, BlockReopenQueue *queue, Error **errp) { @@ -549,6 +1176,7 @@ static int raw_reopen_prepare(BDRVReopenState *state, BDRVRawReopenState *rs; int ret =3D 0; Error *local_err =3D NULL; + bool shared; =20 assert(state !=3D NULL); assert(state->bs !=3D NULL); @@ -613,13 +1241,27 @@ static int raw_reopen_prepare(BDRVReopenState *state, if (rs->fd !=3D -1) { raw_probe_alignment(state->bs, rs->fd, &local_err); if (local_err) { - qemu_close(rs->fd); - rs->fd =3D -1; error_propagate(errp, local_err); ret =3D -EINVAL; + goto fail; } } + shared =3D s->cur_lock_mode =3D=3D RAW_L_READ_SHARE_RW || + s->cur_lock_mode =3D=3D RAW_L_WRITE_SHARE_RW; + /* Shared perm doesn't change during reopen. */ + raw_init_lock_update(state->bs, rs->fd, state->flags & BDRV_O_RDWR, sh= ared, + s->use_lock); =20 + qdict_del(state->options, "locking"); + ret =3D raw_handle_lock_update(state->bs, RAW_LT_PREPARE, errp); + if (ret) { + goto fail; + } + + return 0; +fail: + qemu_close(rs->fd); + rs->fd =3D -1; return ret; } =20 @@ -630,6 +1272,8 @@ static void raw_reopen_commit(BDRVReopenState *state) =20 s->open_flags =3D rs->open_flags; =20 + raw_handle_lock_update(state->bs, RAW_LT_COMMIT, &error_abort); + qemu_close(s->fd); s->fd =3D rs->fd; =20 @@ -647,6 +1291,8 @@ static void raw_reopen_abort(BDRVReopenState *state) return; } =20 + raw_handle_lock_update(state->bs, RAW_LT_ABORT, &error_abort); + if (rs->fd >=3D 0) { qemu_close(rs->fd); rs->fd =3D -1; @@ -1410,6 +2056,10 @@ static void raw_close(BlockDriverState *bs) qemu_close(s->fd); s->fd =3D -1; } + if (s->lock_fd >=3D 0) { + qemu_close(s->lock_fd); + s->lock_fd =3D -1; + } } =20 static int raw_truncate(BlockDriverState *bs, int64_t offset) @@ -1947,6 +2597,85 @@ static QemuOptsList raw_create_opts =3D { } }; =20 +static int raw_check_perm(BlockDriverState *bs, uint64_t perm, uint64_t sh= ared, + Error **errp) +{ + bool is_shared; + BDRVRawState *s =3D bs->opaque; + + if (!RAW_LOCK_SUPPORTED) { + return 0; + } + if (s->lock_update) { + /* Override the previously stashed update. */ + g_free(s->lock_update); + s->lock_update =3D NULL; + } + is_shared =3D shared & BLK_PERM_WRITE; + DPRINTF("raw check perm %p rw %d shared %d\n", + bs, perm & BLK_PERM_WRITE ? 1 : 0, + is_shared); + raw_init_lock_update(bs, s->fd, + perm & BLK_PERM_WRITE, is_shared, s->use_lock); + + return raw_handle_lock_update(bs, RAW_LT_PREPARE, errp); +} + +static void raw_set_perm(BlockDriverState *bs, uint64_t perm, uint64_t sha= red) +{ + BDRVRawState *s =3D bs->opaque; + + if (!RAW_LOCK_SUPPORTED) { + return; + } + assert(s->lock_update); + + raw_handle_lock_update(bs, RAW_LT_COMMIT, NULL); +} + +static void raw_abort_perm_update(BlockDriverState *bs) +{ + BDRVRawState *s =3D bs->opaque; + + if (!RAW_LOCK_SUPPORTED) { + return; + } + if (!s->lock_update) { + return; + } + raw_handle_lock_update(bs, RAW_LT_ABORT, NULL); +} + +static int raw_inactivate(BlockDriverState *bs) +{ + BDRVRawState *s =3D bs->opaque; + int r =3D 0; + + if (RAW_LOCK_SUPPORTED && s->cur_lock_mode !=3D RAW_L_READ_SHARE_RW) { + r =3D raw_lock_fd(s->lock_fd, RAW_L_READ_SHARE_RW, NULL); + } + return r; +} + +static void raw_invalidate_cache(BlockDriverState *bs, Error **errp) +{ + int r; + BDRVRawState *s =3D bs->opaque; + + if (!RAW_LOCK_SUPPORTED) { + return; + } + if (s->lock_update) { + /* Apply the pending lock update from perm or reopen. */ + r =3D raw_handle_lock_update(bs, RAW_LT_PREPARE, errp); + if (r) { + return; + } + raw_handle_lock_update(bs, RAW_LT_COMMIT, errp); + assert(!s->lock_update); + } +} + BlockDriver bdrv_file =3D { .format_name =3D "file", .protocol_name =3D "file", @@ -1977,7 +2706,11 @@ BlockDriver bdrv_file =3D { .bdrv_get_info =3D raw_get_info, .bdrv_get_allocated_file_size =3D raw_get_allocated_file_size, - + .bdrv_inactivate =3D raw_inactivate, + .bdrv_invalidate_cache =3D raw_invalidate_cache, + .bdrv_check_perm =3D raw_check_perm, + .bdrv_set_perm =3D raw_set_perm, + .bdrv_abort_perm_update =3D raw_abort_perm_update, .create_opts =3D &raw_create_opts, }; =20 --=20 2.9.3 From nobody Mon Apr 29 13:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492747897432315.91134230848286; Thu, 20 Apr 2017 21:11:37 -0700 (PDT) Received: from localhost ([::1]:57063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Pux-0001Pz-Nw for importer@patchew.org; Fri, 21 Apr 2017 00:11:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PhG-0006j7-AA for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PhC-0004GH-Bg for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:57:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Ph3-0004Ah-9y; Thu, 20 Apr 2017 23:57:13 -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 355E378245; Fri, 21 Apr 2017 03:57:12 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1708817966; Fri, 21 Apr 2017 03:57:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 355E378245 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 355E378245 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:56:06 +0800 Message-Id: <20170421035606.448-21-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> 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.28]); Fri, 21 Apr 2017 03:57:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v14 20/20] qemu-iotests: Add test case 153 for image locking 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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng --- tests/qemu-iotests/153 | 219 ++++++++++++++++ tests/qemu-iotests/153.out | 627 +++++++++++++++++++++++++++++++++++++++++= ++++ tests/qemu-iotests/group | 1 + 3 files changed, 847 insertions(+) create mode 100755 tests/qemu-iotests/153 create mode 100644 tests/qemu-iotests/153.out diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 new file mode 100755 index 0000000..ff22615 --- /dev/null +++ b/tests/qemu-iotests/153 @@ -0,0 +1,219 @@ +#!/bin/bash +# +# Test image locking +# +# Copyright 2016, 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=3Dfamz@redhat.com + +seq=3D"$(basename $0)" +echo "QA output created by $seq" + +here=3D"$PWD" +tmp=3D/tmp/$$ +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img + rm -f "${TEST_IMG}.base" + rm -f "${TEST_IMG}.convert" + rm -f "${TEST_IMG}.a" + rm -f "${TEST_IMG}.b" + rm -f "${TEST_IMG}.lnk" +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.qemu + +_supported_fmt qcow2 +_supported_proto file +_supported_os Linux + +size=3D32M + +_run_cmd() +{ + echo + (echo "$@"; "$@" 2>&1 1>/dev/null) | _filter_testdir +} + +function _do_run_qemu() +{ + ( + if ! test -t 0; then + while read cmd; do + echo $cmd + done + fi + echo quit + ) | $QEMU -nographic -monitor stdio -serial none "$@" 1>/dev/null +} + +function _run_qemu_with_images() +{ + _do_run_qemu \ + $(for i in $@; do echo "-drive if=3Dnone,file=3D$i"; done) 2>&1 \ + | _filter_testdir | _filter_qemu +} + +test_opts=3D"$(echo readonly=3D{on,off},force-shared-write=3D{on,off})" + +for opts1 in "" $test_opts; do + echo + echo "=3D=3D Creating base image =3D=3D" + TEST_IMG=3D"${TEST_IMG}.base" _make_test_img $size + + echo + echo "=3D=3D Creating test image =3D=3D" + $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filte= r_img_create + + echo + echo "=3D=3D Launching QEMU, opts: '$opts1' =3D=3D" + _launch_qemu -drive file=3D"${TEST_IMG}",if=3Dnone,$opts1 + h=3D$QEMU_HANDLE + + for opts2 in "" $test_opts; do + echo + echo "=3D=3D Launching another QEMU, opts: '$opts2' =3D=3D" + echo "quit" | \ + $QEMU -nographic -monitor stdio \ + -drive file=3D"${TEST_IMG}",if=3Dnone,$opts2 2>&1 1>/dev/null = | \ + _filter_testdir | _filter_qemu + done + + for L in "" "-U"; do + + echo + echo "=3D=3D Running utility commands $L =3D=3D" + _run_cmd $QEMU_IO $L -c "read 0 512" "${TEST_IMG}" + _run_cmd $QEMU_IO $L -r -c "read 0 512" "${TEST_IMG}" + _run_cmd $QEMU_IO -c "open $L ${TEST_IMG}" -c "read 0 512" + _run_cmd $QEMU_IO -c "open -r $L ${TEST_IMG}" -c "read 0 512" + _run_cmd $QEMU_IMG info $L "${TEST_IMG}" + _run_cmd $QEMU_IMG check $L "${TEST_IMG}" + _run_cmd $QEMU_IMG compare $L "${TEST_IMG}" "${TEST_IMG}" + _run_cmd $QEMU_IMG map $L "${TEST_IMG}" + _run_cmd $QEMU_IMG amend -o "" $L "${TEST_IMG}" + _run_cmd $QEMU_IMG commit $L "${TEST_IMG}" + _run_cmd $QEMU_IMG resize $L "${TEST_IMG}" $size + _run_cmd $QEMU_IMG rebase $L "${TEST_IMG}" -b "${TEST_IMG}.ba= se" + _run_cmd $QEMU_IMG snapshot -l $L "${TEST_IMG}" + _run_cmd $QEMU_IMG convert $L "${TEST_IMG}" "${TEST_IMG}.conve= rt" + _run_cmd $QEMU_IMG dd $L if=3D"${TEST_IMG}" of=3D"${TEST_= IMG}.convert" bs=3D512 count=3D1 + _run_cmd $QEMU_IMG bench $L -c 1 "${TEST_IMG}" + _run_cmd $QEMU_IMG bench $L -w -c 1 "${TEST_IMG}" + done + _send_qemu_cmd $h "{ 'execute': 'quit', }" "" + echo + echo "Round done" + _cleanup_qemu +done + +for opt1 in $test_opts; do + for opt2 in $test_opts; do + echo + echo "=3D=3D Two devices with the same image ($opt1 - $opt2) =3D= =3D" + _run_qemu_with_images "${TEST_IMG},$opt1" "${TEST_IMG},$opt2" + done +done + +echo "=3D=3D Creating ${TEST_IMG}.[abc] =3D=3D" +( + $QEMU_IMG create -f qcow2 "${TEST_IMG}.a" -b "${TEST_IMG}" + $QEMU_IMG create -f qcow2 "${TEST_IMG}.b" -b "${TEST_IMG}" + $QEMU_IMG create -f qcow2 "${TEST_IMG}.c" -b "${TEST_IMG}.b" +) | _filter_img_create + +echo +echo "=3D=3D Two devices sharing the same file in backing chain =3D=3D" +_run_qemu_with_images "${TEST_IMG}.a" "${TEST_IMG}.b" +_run_qemu_with_images "${TEST_IMG}.a" "${TEST_IMG}.c" + +echo +echo "=3D=3D Backing image also as an active device =3D=3D" +_run_qemu_with_images "${TEST_IMG}.a" "${TEST_IMG}" + +echo +echo "=3D=3D Backing image also as an active device (ro) =3D=3D" +_run_qemu_with_images "${TEST_IMG}.a" "${TEST_IMG},readonly=3Don" + +echo +echo "=3D=3D Symbolic link =3D=3D" +rm -f "${TEST_IMG}.lnk" &>/dev/null +ln -s ${TEST_IMG} "${TEST_IMG}.lnk" || echo "Failed to create link" +_run_qemu_with_images "${TEST_IMG}.lnk" "${TEST_IMG}" + +echo +echo "=3D=3D Closing an image should unlock it =3D=3D" +_launch_qemu + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + +echo "Adding drive" +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': { 'command-line': 'drive_add 0 if=3Dnone,id=3Dd0,file= =3D${TEST_IMG}' } }" \ + "" + +_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' + +echo "Closing drive" +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': { 'command-line': 'drive_del d0' } }" \ + "" + +_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' + +echo "Adding two and closing one" +for d in d0 d1; do + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': { 'command-line': 'drive_add 0 if=3Dnone,id=3D$d,f= ile=3D${TEST_IMG},readonly=3Don' } }" \ + "" +done + +_run_cmd $QEMU_IMG info "${TEST_IMG}" + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': { 'command-line': 'drive_del d0' } }" \ + "" + +_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' + +echo "Closing the other" +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': { 'command-line': 'drive_del d1' } }" \ + "" + +_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' + +_cleanup_qemu + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out new file mode 100644 index 0000000..786ff0b --- /dev/null +++ b/tests/qemu-iotests/153.out @@ -0,0 +1,627 @@ +QA output created by 153 + +=3D=3D Creating base image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D33554432 + +=3D=3D Creating test image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33554432 backing_file= =3DTEST_DIR/t.IMGFMT.base + +=3D=3D Launching QEMU, opts: '' =3D=3D + +=3D=3D Launching another QEMU, opts: '' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,: Failed to lock image= : Resource temporarily unavailable + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= n' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= ff' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Don,force-sh= ared-write=3Doff: Failed to lock share byte: Resource temporarily unavailab= le + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= on' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Doff,force-s= hared-write=3Don: Failed to lock write byte: Resource temporarily unavailab= le + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= off' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Doff,force-s= hared-write=3Doff: Failed to lock image: Resource temporarily unavailable + +=3D=3D Running utility commands =3D=3D + +_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock share byte: Resource te= mporarily unavailable + +_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock share byte: Resource te= mporarily unavailable + +_qemu_img_wrapper info TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper check TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper compare TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper map TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper amend -o TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper commit TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper resize TEST_DIR/t.qcow2 32M +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper convert TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper dd if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.convert b= s=3D512 count=3D1 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +=3D=3D Running utility commands -U =3D=3D + +_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock write byte: Resource te= mporarily unavailable + +_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock write byte: Resource te= mporarily unavailable + +_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_img_wrapper info -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper check -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper compare -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 + +_qemu_img_wrapper map -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper amend -o -U TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper commit -U TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper resize -U TEST_DIR/t.qcow2 32M +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper convert -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert + +_qemu_img_wrapper dd -U if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.conver= t bs=3D512 count=3D1 + +_qemu_img_wrapper bench -U -c 1 TEST_DIR/t.qcow2 + +_qemu_img_wrapper bench -U -w -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +Round done + +=3D=3D Creating base image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D33554432 + +=3D=3D Creating test image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33554432 backing_file= =3DTEST_DIR/t.IMGFMT.base + +=3D=3D Launching QEMU, opts: 'readonly=3Don,force-shared-write=3Don' =3D= =3D + +=3D=3D Launching another QEMU, opts: '' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= n' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= ff' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= on' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= off' =3D=3D + +=3D=3D Running utility commands =3D=3D + +_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_img_wrapper info TEST_DIR/t.qcow2 + +_qemu_img_wrapper check TEST_DIR/t.qcow2 + +_qemu_img_wrapper compare TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 + +_qemu_img_wrapper map TEST_DIR/t.qcow2 + +_qemu_img_wrapper amend -o TEST_DIR/t.qcow2 + +_qemu_img_wrapper commit TEST_DIR/t.qcow2 + +_qemu_img_wrapper resize TEST_DIR/t.qcow2 32M + +_qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base + +_qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2 + +_qemu_img_wrapper convert TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert + +_qemu_img_wrapper dd if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.convert b= s=3D512 count=3D1 + +_qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2 + +_qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2 + +=3D=3D Running utility commands -U =3D=3D + +_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_img_wrapper info -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper check -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper compare -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 + +_qemu_img_wrapper map -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper amend -o -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper commit -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper resize -U TEST_DIR/t.qcow2 32M + +_qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base + +_qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper convert -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert + +_qemu_img_wrapper dd -U if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.conver= t bs=3D512 count=3D1 + +_qemu_img_wrapper bench -U -c 1 TEST_DIR/t.qcow2 + +_qemu_img_wrapper bench -U -w -c 1 TEST_DIR/t.qcow2 + +Round done + +=3D=3D Creating base image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D33554432 + +=3D=3D Creating test image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33554432 backing_file= =3DTEST_DIR/t.IMGFMT.base + +=3D=3D Launching QEMU, opts: 'readonly=3Don,force-shared-write=3Doff' =3D= =3D + +=3D=3D Launching another QEMU, opts: '' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,: Failed to lock image= : Resource temporarily unavailable + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= n' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= ff' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= on' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Doff,force-s= hared-write=3Don: Share byte lock is taken: Resource temporarily unavailable + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= off' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Doff,force-s= hared-write=3Doff: Failed to lock image: Resource temporarily unavailable + +=3D=3D Running utility commands =3D=3D + +_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_img_wrapper info TEST_DIR/t.qcow2 + +_qemu_img_wrapper check TEST_DIR/t.qcow2 + +_qemu_img_wrapper compare TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 + +_qemu_img_wrapper map TEST_DIR/t.qcow2 + +_qemu_img_wrapper amend -o TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper commit TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper resize TEST_DIR/t.qcow2 32M +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2 + +_qemu_img_wrapper convert TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert + +_qemu_img_wrapper dd if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.convert b= s=3D512 count=3D1 + +_qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2 + +_qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +=3D=3D Running utility commands -U =3D=3D + +_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Share byte lock is taken: Resource tem= porarily unavailable + +_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Share byte lock is taken: Resource tem= porarily unavailable + +_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_img_wrapper info -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper check -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper compare -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 + +_qemu_img_wrapper map -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper amend -o -U TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Share byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper commit -U TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Share byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper resize -U TEST_DIR/t.qcow2 32M +qemu-img: Could not open 'TEST_DIR/t.qcow2': Share byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base +qemu-img: Could not open 'TEST_DIR/t.qcow2': Share byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper convert -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert + +_qemu_img_wrapper dd -U if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.conver= t bs=3D512 count=3D1 + +_qemu_img_wrapper bench -U -c 1 TEST_DIR/t.qcow2 + +_qemu_img_wrapper bench -U -w -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Share byte lock is taken: Res= ource temporarily unavailable + +Round done + +=3D=3D Creating base image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D33554432 + +=3D=3D Creating test image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33554432 backing_file= =3DTEST_DIR/t.IMGFMT.base + +=3D=3D Launching QEMU, opts: 'readonly=3Doff,force-shared-write=3Don' =3D= =3D + +=3D=3D Launching another QEMU, opts: '' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,: Failed to lock image= : Resource temporarily unavailable + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= n' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= ff' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Don,force-sh= ared-write=3Doff: Write byte lock is taken: Resource temporarily unavailable + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= on' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= off' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Doff,force-s= hared-write=3Doff: Failed to lock image: Resource temporarily unavailable + +=3D=3D Running utility commands =3D=3D + +_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Write byte lock is taken: Resource tem= porarily unavailable + +_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Write byte lock is taken: Resource tem= porarily unavailable + +_qemu_img_wrapper info TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper check TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper compare TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper map TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper amend -o TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper commit TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper resize TEST_DIR/t.qcow2 32M +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper convert TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper dd if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.convert b= s=3D512 count=3D1 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Write byte lock is taken: Res= ource temporarily unavailable + +_qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +=3D=3D Running utility commands -U =3D=3D + +_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_img_wrapper info -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper check -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper compare -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 + +_qemu_img_wrapper map -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper amend -o -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper commit -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper resize -U TEST_DIR/t.qcow2 32M + +_qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base + +_qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper convert -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert + +_qemu_img_wrapper dd -U if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.conver= t bs=3D512 count=3D1 + +_qemu_img_wrapper bench -U -c 1 TEST_DIR/t.qcow2 + +_qemu_img_wrapper bench -U -w -c 1 TEST_DIR/t.qcow2 + +Round done + +=3D=3D Creating base image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D33554432 + +=3D=3D Creating test image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33554432 backing_file= =3DTEST_DIR/t.IMGFMT.base + +=3D=3D Launching QEMU, opts: 'readonly=3Doff,force-shared-write=3Doff' =3D= =3D + +=3D=3D Launching another QEMU, opts: '' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,: Failed to lock image= : Resource temporarily unavailable + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= n' =3D=3D + +=3D=3D Launching another QEMU, opts: 'readonly=3Don,force-shared-write=3Do= ff' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Don,force-sh= ared-write=3Doff: Failed to lock share byte: Resource temporarily unavailab= le + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= on' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Doff,force-s= hared-write=3Don: Failed to lock write byte: Resource temporarily unavailab= le + +=3D=3D Launching another QEMU, opts: 'readonly=3Doff,force-shared-write=3D= off' =3D=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,readonly=3Doff,force-s= hared-write=3Doff: Failed to lock image: Resource temporarily unavailable + +=3D=3D Running utility commands =3D=3D + +_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock share byte: Resource te= mporarily unavailable + +_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable + +_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock share byte: Resource te= mporarily unavailable + +_qemu_img_wrapper info TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper check TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper compare TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper map TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper amend -o TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper commit TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper resize TEST_DIR/t.qcow2 32M +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +_qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper convert TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper dd if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.convert b= s=3D512 count=3D1 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock share byte: Re= source temporarily unavailable + +_qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock image: Resourc= e temporarily unavailable + +=3D=3D Running utility commands -U =3D=3D + +_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 +can't open device TEST_DIR/t.qcow2: Failed to lock write byte: Resource te= mporarily unavailable + +_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 + +_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock write byte: Resource te= mporarily unavailable + +_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 + +_qemu_img_wrapper info -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper check -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper compare -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2 + +_qemu_img_wrapper map -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper amend -o -U TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper commit -U TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper resize -U TEST_DIR/t.qcow2 32M +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +_qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2 + +_qemu_img_wrapper convert -U TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert + +_qemu_img_wrapper dd -U if=3DTEST_DIR/t.qcow2 of=3DTEST_DIR/t.qcow2.conver= t bs=3D512 count=3D1 + +_qemu_img_wrapper bench -U -c 1 TEST_DIR/t.qcow2 + +_qemu_img_wrapper bench -U -w -c 1 TEST_DIR/t.qcow2 +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to lock write byte: Re= source temporarily unavailable + +Round done + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Don - readonly=3Don,force-shared-write=3Don) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Don - readonly=3Don,force-shared-write=3Doff) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Don - readonly=3Doff,force-shared-write=3Don) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Don - readonly=3Doff,force-shared-write=3Doff) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Doff - readonly=3Don,force-shared-write=3Don) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Doff - readonly=3Don,force-shared-write=3Doff) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Doff - readonly=3Doff,force-shared-write=3Don) =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2,readonly=3Doff,force-s= hared-write=3Don: Share byte lock is taken: Resource temporarily unavailable + +=3D=3D Two devices with the same image (readonly=3Don,force-shared-write= =3Doff - readonly=3Doff,force-shared-write=3Doff) =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2,readonly=3Doff,force-s= hared-write=3Doff: Failed to lock image: Resource temporarily unavailable + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Don - readonly=3Don,force-shared-write=3Don) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Don - readonly=3Don,force-shared-write=3Doff) =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2,readonly=3Don,force-sh= ared-write=3Doff: Write byte lock is taken: Resource temporarily unavailable + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Don - readonly=3Doff,force-shared-write=3Don) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Don - readonly=3Doff,force-shared-write=3Doff) =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2,readonly=3Doff,force-s= hared-write=3Doff: Failed to lock image: Resource temporarily unavailable + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Doff - readonly=3Don,force-shared-write=3Don) =3D=3D + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Doff - readonly=3Don,force-shared-write=3Doff) =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2,readonly=3Don,force-sh= ared-write=3Doff: Failed to lock share byte: Resource temporarily unavailab= le + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Doff - readonly=3Doff,force-shared-write=3Don) =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2,readonly=3Doff,force-s= hared-write=3Don: Failed to lock write byte: Resource temporarily unavailab= le + +=3D=3D Two devices with the same image (readonly=3Doff,force-shared-write= =3Doff - readonly=3Doff,force-shared-write=3Doff) =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2,readonly=3Doff,force-s= hared-write=3Doff: Failed to lock image: Resource temporarily unavailable +=3D=3D Creating /var/tmp/q/build/tests/qemu-iotests/scratch/t.qcow2.[abc] = =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.a', fmt=3DIMGFMT size=3D33554432 backing_fil= e=3DTEST_DIR/t.IMGFMT +Formatting 'TEST_DIR/t.IMGFMT.b', fmt=3DIMGFMT size=3D33554432 backing_fil= e=3DTEST_DIR/t.IMGFMT +Formatting 'TEST_DIR/t.IMGFMT.c', fmt=3DIMGFMT size=3D33554432 backing_fil= e=3DTEST_DIR/t.IMGFMT.b + +=3D=3D Two devices sharing the same file in backing chain =3D=3D + +=3D=3D Backing image also as an active device =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2: Failed to lock image:= Resource temporarily unavailable + +=3D=3D Backing image also as an active device (ro) =3D=3D + +=3D=3D Symbolic link =3D=3D +QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2: Failed to lock image:= Resource temporarily unavailable + +=3D=3D Closing an image should unlock it =3D=3D +{"return": {}} +Adding drive + +_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable +Closing drive + +_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 +Adding two and closing one + +_qemu_img_wrapper info TEST_DIR/t.qcow2 + +_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 +can't open device TEST_DIR/t.qcow2: Failed to lock image: Resource tempora= rily unavailable +Closing the other + +_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 893962d..c8ae60e 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -154,6 +154,7 @@ 149 rw auto sudo 150 rw auto quick 152 rw auto quick +153 rw auto quick 154 rw auto backing quick 155 rw auto 156 rw auto quick --=20 2.9.3