Received: from eggs.gnu.org ([209.51.188.92]:33768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hK1Q3-0003rK-Q4 for qemu-devel@nongnu.org; Fri, 26 Apr 2019 10:01:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hK1Py-0005eQ-6h for qemu-devel@nongnu.org; Fri, 26 Apr 2019 10:01:39 -0400 From: Alberto Garcia In-Reply-To: <20190403143748.9790-1-berto@igalia.com> References: <20190403143748.9790-1-berto@igalia.com> Date: Fri, 26 Apr 2019 16:01:27 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH for-4.1] commit: Use bdrv_append() in commit_start() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf , Max Reitz ping On Wed 03 Apr 2019 04:37:48 PM CEST, Alberto Garcia wrote: > This function combines bdrv_set_backing_hd() and bdrv_replace_node() > so we can use it to simplify the code a bit in commit_start(). > > Signed-off-by: Alberto Garcia > --- > block/commit.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/block/commit.c b/block/commit.c > index ba60fef58a..a0beb7d265 100644 > --- a/block/commit.c > +++ b/block/commit.c > @@ -304,23 +304,14 @@ void commit_start(const char *job_id, BlockDriverState *bs, > commit_top_bs->total_sectors = top->total_sectors; > bdrv_set_aio_context(commit_top_bs, bdrv_get_aio_context(top)); > > - bdrv_set_backing_hd(commit_top_bs, top, &local_err); > + bdrv_append(commit_top_bs, top, &local_err); > if (local_err) { > - bdrv_unref(commit_top_bs); > - commit_top_bs = NULL; > - error_propagate(errp, local_err); > - goto fail; > - } > - bdrv_replace_node(top, commit_top_bs, &local_err); > - if (local_err) { > - bdrv_unref(commit_top_bs); > commit_top_bs = NULL; > error_propagate(errp, local_err); > goto fail; > } > > s->commit_top_bs = commit_top_bs; > - bdrv_unref(commit_top_bs); > > /* Block all nodes between top and base, because they will > * disappear from the chain after this operation. */ > -- > 2.11.0