From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCrLw-000418-8j for qemu-devel@nongnu.org; Mon, 10 Feb 2014 08:56:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCrLr-0007Cp-9I for qemu-devel@nongnu.org; Mon, 10 Feb 2014 08:56:52 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:49573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCrLq-0007Cb-Uh for qemu-devel@nongnu.org; Mon, 10 Feb 2014 08:56:47 -0500 Date: Mon, 10 Feb 2014 14:49:29 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140210134929.GJ3088@irqsave.net> References: <1391881159-13585-1-git-send-email-mreitz@redhat.com> <1391881159-13585-6-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1391881159-13585-6-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 5/8] 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 , Jeff Cody , qemu-devel@nongnu.org, Stefan Hajnoczi Le Saturday 08 Feb 2014 =E0 18:39:16 (+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 | 24 +++++++++++++----------- > 1 file changed, 13 insertions(+), 11 deletions(-) >=20 > diff --git a/block.c b/block.c > index 4c105bb..c57ad2c 100644 > --- a/block.c > +++ b/block.c > @@ -953,10 +953,9 @@ 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; > @@ -968,7 +967,6 @@ static int bdrv_file_open(BlockDriverState **pbs, c= onst char *filename, > options =3D qdict_new(); > } > =20 > - bs =3D bdrv_new(""); > bs->options =3D options; > options =3D qdict_clone_shallow(options); > =20 > @@ -1042,7 +1040,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: > @@ -1050,7 +1047,6 @@ fail: > if (!bs->drv) { > QDECREF(bs->options); > } > - bdrv_unref(bs); > return ret; > } > =20 > @@ -1242,18 +1238,24 @@ 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(""); > } > =20 > + if (flags & BDRV_O_PROTOCOL) { > + assert(!drv); > + ret =3D bdrv_file_open(bs, filename, options, flags & ~BDRV_O_= PROTOCOL, > + errp); > + if (ret && !*pbs) { > + bdrv_unref(bs); > + } else if (!ret) { > + *pbs =3D bs; > + } > + return ret; > + } > + > /* NULL means an empty set of options */ > if (options =3D=3D NULL) { > options =3D qdict_new(); > --=20 > 1.8.5.4 >=20 Reviewed-by: Benoit Canet