From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv4Sd-0004tL-GK for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:50:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wv4SX-0000gX-HO for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:50:31 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:46661 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv4SX-0000gT-Ap for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:50:25 -0400 Date: Thu, 12 Jun 2014 14:50:24 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140612125024.GF24528@irqsave.net> References: <1402495503-4722-1-git-send-email-kwolf@redhat.com> <1402495503-4722-7-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1402495503-4722-7-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 6/9] block: Inline bdrv_file_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com The Wednesday 11 Jun 2014 =E0 16:05:00 (+0200), Kevin Wolf wrote : > It doesn't do much any more, we can move the code to bdrv_open() now. >=20 > Signed-off-by: Kevin Wolf > --- > block.c | 51 +++++++++++---------------------------------------- > 1 file changed, 11 insertions(+), 40 deletions(-) >=20 > diff --git a/block.c b/block.c > index 2aa0a56..034656f 100644 > --- a/block.c > +++ b/block.c > @@ -1126,44 +1126,6 @@ static int bdrv_fill_options(QDict **options, co= nst char **pfilename, int flags, > return 0; > } > =20 > -/* > - * Opens a file using a protocol (file, host_device, nbd, ...) > - * > - * options is an indirect pointer to a QDict of options to pass to the= block > - * drivers, or pointer to NULL for an empty set of options. If this fu= nction > - * takes ownership of the QDict reference, it will set *options to NUL= L; > - * otherwise, it will contain unused/unrecognized options after this f= unction > - * returns. Then, the caller is responsible for freeing it. If it inte= nds to > - * reuse the QDict, QINCREF() should be called beforehand. > - */ > -static int bdrv_file_open(BlockDriverState *bs, BlockDriver *drv, > - QDict **options, int flags, Error **errp) > -{ > - const char *filename; > - Error *local_err =3D NULL; > - int ret; > - > - filename =3D qdict_get_try_str(*options, "filename"); > - > - /* Open the file */ > - if (!drv->bdrv_file_open) { > - ret =3D bdrv_open(&bs, filename, NULL, *options, flags, drv, &= local_err); > - *options =3D NULL; > - } else { > - ret =3D bdrv_open_common(bs, NULL, *options, flags, drv, &loca= l_err); > - } > - if (ret < 0) { > - error_propagate(errp, local_err); > - goto fail; > - } > - > - bs->growable =3D 1; > - return 0; > - > -fail: > - return ret; > -} > - > void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backi= ng_hd) > { > =20 > @@ -1494,9 +1456,18 @@ int bdrv_open(BlockDriverState **pbs, const char= *filename, > =20 > /* Open the image */ > if (flags & BDRV_O_PROTOCOL) { > - ret =3D bdrv_file_open(bs, drv, &options, flags & ~BDRV_O_PROT= OCOL, > - &local_err); > + if (!drv->bdrv_file_open) { > + const char *filename; > + filename =3D qdict_get_try_str(options, "filename"); > + ret =3D bdrv_open(&bs, filename, NULL, options, > + flags & ~BDRV_O_PROTOCOL, drv, &local_err)= ; > + options =3D NULL; > + } else { > + ret =3D bdrv_open_common(bs, NULL, options, > + flags & ~BDRV_O_PROTOCOL, drv, &loc= al_err); > + } > if (!ret) { > + bs->growable =3D 1; > goto done; > } else if (bs->drv) { > goto close_and_fail; > --=20 > 1.8.3.1 >=20 >=20 Reviewed-by: Benoit Canet