From nobody Thu May 2 18:30:10 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520583239629519.3717862403914; Fri, 9 Mar 2018 00:13:59 -0800 (PST) Received: from localhost ([::1]:43726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euDA6-0004wx-1s for importer@patchew.org; Fri, 09 Mar 2018 03:13:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD5r-0001ia-6D for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euD5q-0008Oq-2g for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:35 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57666 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euD5j-0008MT-CV; Fri, 09 Mar 2018 03:09:27 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E6664015A51; Fri, 9 Mar 2018 08:09:23 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-195.pek2.redhat.com [10.72.12.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 974DA11701CC; Fri, 9 Mar 2018 08:09:21 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 16:09:07 +0800 Message-Id: <20180309080910.7274-2-famz@redhat.com> In-Reply-To: <20180309080910.7274-1-famz@redhat.com> References: <20180309080910.7274-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 08:09:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 08:09:23 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/4] block: Pass "current_flags" in BdrvChildRole.inherit_options 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" So that the current flags can influence the returned flags in the coming patches. For now, 0 is passed everywhere and the parameter is not used. Signed-off-by: Fam Zheng --- block.c | 20 +++++++++++++------- block/block-backend.c | 3 ++- block/vvfat.c | 3 ++- include/block/block_int.h | 3 ++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 4f76714f6b..bedbe208e6 100644 --- a/block.c +++ b/block.c @@ -869,7 +869,8 @@ static void bdrv_temp_snapshot_options(int *child_flags= , QDict *child_options, * is expected, based on the given options and flags for the parent BDS */ static void bdrv_inherited_options(int *child_flags, QDict *child_options, - int parent_flags, QDict *parent_options) + int parent_flags, QDict *parent_options, + int current_flags) { int flags =3D parent_flags; =20 @@ -913,10 +914,12 @@ const BdrvChildRole child_file =3D { * flags for the parent BDS */ static void bdrv_inherited_fmt_options(int *child_flags, QDict *child_opti= ons, - int parent_flags, QDict *parent_opt= ions) + int parent_flags, QDict *parent_opt= ions, + int current_flags) { child_file.inherit_options(child_flags, child_options, - parent_flags, parent_options); + parent_flags, parent_options, + current_flags); =20 *child_flags &=3D ~(BDRV_O_PROTOCOL | BDRV_O_NO_IO); } @@ -991,7 +994,8 @@ static void bdrv_backing_detach(BdrvChild *c) * given options and flags for the parent BDS */ static void bdrv_backing_options(int *child_flags, QDict *child_options, - int parent_flags, QDict *parent_options) + int parent_flags, QDict *parent_options, + int current_flags) { int flags =3D parent_flags; =20 @@ -2548,7 +2552,8 @@ static BlockDriverState *bdrv_open_inherit(const char= *filename, if (child_role) { bs->inherits_from =3D parent; child_role->inherit_options(&flags, options, - parent->open_flags, parent->options); + parent->open_flags, parent->options, + 0); } =20 ret =3D bdrv_fill_options(&options, filename, &flags, &local_err); @@ -2576,7 +2581,7 @@ static BlockDriverState *bdrv_open_inherit(const char= *filename, flags, options); /* Let bdrv_backing_options() override "read-only" */ qdict_del(options, BDRV_OPT_READ_ONLY); - bdrv_backing_options(&flags, options, flags, options); + bdrv_backing_options(&flags, options, flags, options, 0); } =20 bs->open_flags =3D flags; @@ -2837,7 +2842,8 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bloc= kReopenQueue *bs_queue, /* Inherit from parent node */ if (parent_options) { assert(!flags); - role->inherit_options(&flags, options, parent_flags, parent_option= s); + role->inherit_options(&flags, options, parent_flags, parent_option= s, + 0); } =20 /* Old values are used for options that aren't set yet */ diff --git a/block/block-backend.c b/block/block-backend.c index b3c790e2bd..a9a72f5aa8 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -107,7 +107,8 @@ static QTAILQ_HEAD(, BlockBackend) monitor_block_backen= ds =3D QTAILQ_HEAD_INITIALIZER(monitor_block_backends); =20 static void blk_root_inherit_options(int *child_flags, QDict *child_option= s, - int parent_flags, QDict *parent_optio= ns) + int parent_flags, QDict *parent_optio= ns, + int current_flags) { /* We're not supposed to call this function for root nodes */ abort(); diff --git a/block/vvfat.c b/block/vvfat.c index 4a17a49e12..ae90aa0af0 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -3126,7 +3126,8 @@ static BlockDriver vvfat_write_target =3D { }; =20 static void vvfat_qcow_options(int *child_flags, QDict *child_options, - int parent_flags, QDict *parent_options) + int parent_flags, QDict *parent_options, + int current_flags) { qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "off"); *child_flags =3D BDRV_O_NO_FLUSH; diff --git a/include/block/block_int.h b/include/block/block_int.h index 64a5700f2b..fcda7220a2 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -535,7 +535,8 @@ struct BdrvChildRole { bool stay_at_node; =20 void (*inherit_options)(int *child_flags, QDict *child_options, - int parent_flags, QDict *parent_options); + int parent_flags, QDict *parent_options, + int current_flags); =20 void (*change_media)(BdrvChild *child, bool load); void (*resize)(BdrvChild *child); --=20 2.14.3 From nobody Thu May 2 18:30:10 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152058324673012.855190887333151; Fri, 9 Mar 2018 00:14:06 -0800 (PST) Received: from localhost ([::1]:43728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euDAC-00055x-VO for importer@patchew.org; Fri, 09 Mar 2018 03:14:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD5q-0001i6-PR for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euD5p-0008OR-Ls for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:34 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43330 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euD5j-0008MU-CY; Fri, 09 Mar 2018 03:09:27 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9916876FBA; Fri, 9 Mar 2018 08:09:25 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-195.pek2.redhat.com [10.72.12.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id E144010C6EAB; Fri, 9 Mar 2018 08:09:23 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 16:09:08 +0800 Message-Id: <20180309080910.7274-3-famz@redhat.com> In-Reply-To: <20180309080910.7274-1-famz@redhat.com> References: <20180309080910.7274-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 09 Mar 2018 08:09:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 09 Mar 2018 08:09:25 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 2/4] block: Fix write flags in bdrv_backing_options 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" When the child in question already has write access, we shouldn't change that just because the parent being open/reopen doesn't need it. But if we are inherenting the flags from a writable parent, we shouldn't copy the BDRV_O_RDWR flag, which is consistent with the BDRV_OPT_READ_ONLY option we set. Signed-off-by: Fam Zheng --- block.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index bedbe208e6..937f9fe159 100644 --- a/block.c +++ b/block.c @@ -997,7 +997,10 @@ static void bdrv_backing_options(int *child_flags, QDi= ct *child_options, int parent_flags, QDict *parent_options, int current_flags) { - int flags =3D parent_flags; + /* write flag should be preserved if the backing file already has it. = This + * is important during reopen, to keep "parallel block jobs" work. */ + int write_flag =3D current_flags & BDRV_O_RDWR; + int flags =3D parent_flags | write_flag; =20 /* The cache mode is inherited unmodified for backing files; except WC= E, * which is only applied on the top level (BlockBackend) */ @@ -1005,9 +1008,13 @@ static void bdrv_backing_options(int *child_flags, Q= Dict *child_options, qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_NO_FL= USH); qdict_copy_default(child_options, parent_options, BDRV_OPT_FORCE_SHARE= ); =20 - /* backing files always opened read-only */ - qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on"); - flags &=3D ~BDRV_O_COPY_ON_READ; + + if (!write_flag) { + flags &=3D ~BDRV_O_COPY_ON_READ; + /* backing files always opened read-only */ + qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on"); + flags &=3D ~BDRV_O_RDWR; + } =20 /* snapshot=3Don is handled on the top layer */ flags &=3D ~(BDRV_O_SNAPSHOT | BDRV_O_TEMPORARY); --=20 2.14.3 From nobody Thu May 2 18:30:10 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520583097722368.4017161153197; Fri, 9 Mar 2018 00:11:37 -0800 (PST) Received: from localhost ([::1]:43716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD7k-0002sw-Mi for importer@patchew.org; Fri, 09 Mar 2018 03:11:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD5q-0001hf-Jr for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euD5p-0008OW-NA for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:34 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57668 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euD5k-0008Mr-C6; Fri, 09 Mar 2018 03:09:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0EA384026779; Fri, 9 Mar 2018 08:09:28 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-195.pek2.redhat.com [10.72.12.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 305B210B0F20; Fri, 9 Mar 2018 08:09:25 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 16:09:09 +0800 Message-Id: <20180309080910.7274-4-famz@redhat.com> In-Reply-To: <20180309080910.7274-1-famz@redhat.com> References: <20180309080910.7274-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 08:09:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 08:09:28 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 3/4] block: Use the actual current_flags during reopen 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" This complies to the function contract and allows bdrv_backing_options to make the right decision. Signed-off-by: Fam Zheng --- block.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 937f9fe159..1e2b0d822d 100644 --- a/block.c +++ b/block.c @@ -2785,14 +2785,14 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bl= ockReopenQueue *bs_queue, BlockDriverState *bs, QDict *options, int flags, - const BdrvChildRole *role, + BdrvChild *child, QDict *parent_options, int parent_flags) { assert(bs !=3D NULL); =20 BlockReopenQueueEntry *bs_entry; - BdrvChild *child; + BdrvChild *c; QDict *old_options, *explicit_options; =20 /* Make sure that the caller remembered to use a drained section. This= is @@ -2847,10 +2847,11 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bl= ockReopenQueue *bs_queue, explicit_options =3D qdict_clone_shallow(options); =20 /* Inherit from parent node */ + assert(!!child =3D=3D !!parent_options); if (parent_options) { - assert(!flags); - role->inherit_options(&flags, options, parent_flags, parent_option= s, - 0); + child->role->inherit_options(&flags, options, + parent_flags, parent_options, + child->bs->open_flags); } =20 /* Old values are used for options that aren't set yet */ @@ -2881,23 +2882,23 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bl= ockReopenQueue *bs_queue, bs_entry->state.perm =3D UINT64_MAX; bs_entry->state.shared_perm =3D 0; =20 - QLIST_FOREACH(child, &bs->children, next) { + QLIST_FOREACH(c, &bs->children, next) { QDict *new_child_options; char *child_key_dot; =20 /* reopen can only change the options of block devices that were * implicitly created and inherited options. For other (referenced) * block devices, a syntax like "backing.foo" results in an error.= */ - if (child->bs->inherits_from !=3D bs) { + if (c->bs->inherits_from !=3D bs) { continue; } =20 - child_key_dot =3D g_strdup_printf("%s.", child->name); + child_key_dot =3D g_strdup_printf("%s.", c->name); qdict_extract_subqdict(options, &new_child_options, child_key_dot); g_free(child_key_dot); =20 - bdrv_reopen_queue_child(bs_queue, child->bs, new_child_options, 0, - child->role, options, flags); + bdrv_reopen_queue_child(bs_queue, c->bs, new_child_options, 0, + c, options, flags); } =20 return bs_queue; --=20 2.14.3 From nobody Thu May 2 18:30:10 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520583098403145.1643764955104; Fri, 9 Mar 2018 00:11:38 -0800 (PST) Received: from localhost ([::1]:43717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD7l-0002uF-58 for importer@patchew.org; Fri, 09 Mar 2018 03:11:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD5q-0001hi-KB for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euD5p-0008Oh-QM for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:34 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43336 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euD5m-0008NM-Kl; Fri, 09 Mar 2018 03:09:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50D38BD9E; Fri, 9 Mar 2018 08:09:30 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-195.pek2.redhat.com [10.72.12.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95CE510B0F20; Fri, 9 Mar 2018 08:09:28 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 16:09:10 +0800 Message-Id: <20180309080910.7274-5-famz@redhat.com> In-Reply-To: <20180309080910.7274-1-famz@redhat.com> References: <20180309080910.7274-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 09 Mar 2018 08:09:30 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 09 Mar 2018 08:09:30 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 4/4] iotests: Add regression test for commit base 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 | 6 ++++++ tests/qemu-iotests/153.out | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index fa25eb24bd..5a82acebd3 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -177,6 +177,12 @@ 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}" =20 +echo +echo "=3D=3D Active commit to intermediate layer should work when base in = use =3D=3D" +_launch_qemu -drive format=3D$IMGFMT,file=3D"${TEST_IMG}.a",id=3Ddrive0 \ + -device virtio-blk,drive=3Ddrive0 +_run_cmd $QEMU_IMG commit -b "${TEST_IMG}.b" "${TEST_IMG}.c" + echo echo "=3D=3D Closing an image should unlock it =3D=3D" _launch_qemu diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out index 5b917b177c..60d2d661f1 100644 --- a/tests/qemu-iotests/153.out +++ b/tests/qemu-iotests/153.out @@ -373,6 +373,10 @@ Is another process using the image? QEMU_PROG: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2: Failed to get "write"= lock Is another process using the image? =20 +=3D=3D Active commit to intermediate layer should work when base in use = =3D=3D + +_qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DIR/t.qcow2.c + =3D=3D Closing an image should unlock it =3D=3D {"return": {}} Adding drive --=20 2.14.3