From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7cUl-0007aN-0C for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:04:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7cUe-000679-W1 for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:04:18 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:48415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7cUe-000675-Kq for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:04:12 -0500 Date: Mon, 27 Jan 2014 04:04:13 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140127030413.GE7415@irqsave.net> 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=iso-8859-1 Content-Disposition: inline In-Reply-To: <1390762963-25538-7-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable 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: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi Le Sunday 26 Jan 2014 =E0 20:02:39 (+0100), Max Reitz a =E9crit : > 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. >=20 > Signed-off-by: Max Reitz > --- > block.c | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) >=20 > 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 =3D NULL; > BlockDriver *drv; > const char *drvname; > bool allow_protocol_prefix =3D false; > Error *local_err =3D NULL; > int ret; > =20 > - bs =3D bdrv_new(""); > bs->options =3D options; > options =3D qdict_clone_shallow(options); > =20 > @@ -1036,7 +1034,6 @@ static int bdrv_file_open(BlockDriverState **pbs,= const char *filename, > QDECREF(options); > =20 > bs->growable =3D 1; > - *pbs =3D bs; > return 0; > =20 > fail: > @@ -1044,7 +1041,6 @@ fail: > if (!bs->drv) { > QDECREF(bs->options); > } > - bdrv_unref(bs); > return ret; > } > =20 > @@ -1235,17 +1231,28 @@ int bdrv_open(BlockDriverState **pbs, const cha= r *filename, > return 0; > } > =20 > - if (flags & BDRV_O_PROTOCOL) { > - assert(!drv); > - return bdrv_file_open(pbs, filename, options, flags & ~BDRV_O_= PROTOCOL, > - errp); > - } > - > if (*pbs) { > bs =3D *pbs; > } else { > bs =3D bdrv_new(""); > } > + > + if (flags & BDRV_O_PROTOCOL) { > + assert(!drv); > + ret =3D bdrv_file_open(bs, filename, options, flags & ~BDRV_O_= PROTOCOL, > + errp); > + if (ret) { > + if (*pbs) { > + bdrv_close(bs); > + } else { > + bdrv_unref(bs); > + } Can the goto chain be factorized with this snippet of code: something lik= e this is already in it ? Something like if (!ret) { return ret; } goto exit_close_or_unref; > + } else { > + *pbs =3D bs; > + } > + return ret; > + } > + > bs->options =3D options; > options =3D qdict_clone_shallow(options); > =20 > --=20 > 1.8.5.3 >=20 >=20