From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8VIO-0007Bk-45 for qemu-devel@nongnu.org; Wed, 29 Jan 2014 08:35:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8VIH-0007UI-KP for qemu-devel@nongnu.org; Wed, 29 Jan 2014 08:35:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8VIH-0007Rr-65 for qemu-devel@nongnu.org; Wed, 29 Jan 2014 08:35:05 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0TDZ46v019611 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 29 Jan 2014 08:35:04 -0500 Date: Wed, 29 Jan 2014 14:35:01 +0100 From: Kevin Wolf Message-ID: <20140129133501.GH2726@dhcp-200-207.str.redhat.com> References: <1390762963-25538-1-git-send-email-mreitz@redhat.com> <1390762963-25538-7-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1390762963-25538-7-git-send-email-mreitz@redhat.com> Subject: Re: [Qemu-devel] [PATCH 06/10] block: Remove bdrv_new() from bdrv_file_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: qemu-devel@nongnu.org, Stefan Hajnoczi Am 26.01.2014 um 20:02 hat Max Reitz geschrieben: > Change bdrv_file_open() to take a simple pointer to an already existing > BDS instead of an indirect one. The BDS will be created in bdrv_open() > if necessary. > > Signed-off-by: Max Reitz > --- > block.c | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/block.c b/block.c > index 6c29115..72eddd5 100644 > --- a/block.c > +++ b/block.c > @@ -947,17 +947,15 @@ free_and_fail: > * after the call (even on failure), so if the caller intends to reuse the > * dictionary, it needs to use QINCREF() before calling bdrv_file_open. > */ > -static int bdrv_file_open(BlockDriverState **pbs, const char *filename, > +static int bdrv_file_open(BlockDriverState *bs, const char *filename, > QDict *options, int flags, Error **errp) > { > - BlockDriverState *bs = NULL; > BlockDriver *drv; > const char *drvname; > bool allow_protocol_prefix = false; > Error *local_err = NULL; > int ret; > > - bs = bdrv_new(""); > bs->options = options; > options = qdict_clone_shallow(options); > > @@ -1036,7 +1034,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, > QDECREF(options); > > bs->growable = 1; > - *pbs = bs; > return 0; > > fail: > @@ -1044,7 +1041,6 @@ fail: > if (!bs->drv) { > QDECREF(bs->options); > } > - bdrv_unref(bs); > return ret; > } > > @@ -1235,17 +1231,28 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, > return 0; > } > > - if (flags & BDRV_O_PROTOCOL) { > - assert(!drv); > - return bdrv_file_open(pbs, filename, options, flags & ~BDRV_O_PROTOCOL, > - errp); > - } > - > if (*pbs) { > bs = *pbs; > } else { > bs = bdrv_new(""); > } > + > + if (flags & BDRV_O_PROTOCOL) { > + assert(!drv); > + ret = bdrv_file_open(bs, filename, options, flags & ~BDRV_O_PROTOCOL, > + errp); > + if (ret) { > + if (*pbs) { > + bdrv_close(bs); Why would bs be open when bdrv_file_open() just failed? > + } else { > + bdrv_unref(bs); > + } > + } else { > + *pbs = bs; > + } > + return ret; > + } > + > bs->options = options; > options = qdict_clone_shallow(options); Kevin