From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv3yO-0005o3-Hi for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:19:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wv3yH-0005c2-2b for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:19:16 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:46648 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv3yG-0005bv-SI for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:19:08 -0400 Date: Thu, 12 Jun 2014 14:19:07 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140612121906.GB24528@irqsave.net> References: <1402495503-4722-1-git-send-email-kwolf@redhat.com> <1402495503-4722-3-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-3-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/9] block: Move bdrv_fill_options() call to bdrv_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:04:56 (+0200), Kevin Wolf wrote : > bs->options now contains the modified version of the options. >=20 > Signed-off-by: Kevin Wolf > --- > block.c | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) >=20 > diff --git a/block.c b/block.c > index c5707e8..effb3e6 100644 > --- a/block.c > +++ b/block.c > @@ -1010,14 +1010,19 @@ free_and_fail: > * Fills in default options for opening images and converts the legacy > * filename/flags pair to option QDict entries. > */ > -static int bdrv_fill_options(QDict **options, const char *filename, > +static int bdrv_fill_options(QDict **options, const char *filename, in= t flags, > Error **errp) > { > const char *drvname; > + bool protocol =3D flags & BDRV_O_PROTOCOL; > bool parse_filename =3D false; > Error *local_err =3D NULL; > BlockDriver *drv; > =20 > + if (!protocol) { > + return 0; > + } > + Does this mean we are sure that we don't have image format with baroque p= arameters in the filename ? This does make sense. > /* Fetch the file name from the options QDict if necessary */ > if (filename) { > if (filename && !qdict_haskey(*options, "filename")) { > @@ -1082,20 +1087,15 @@ static int bdrv_fill_options(QDict **options, c= onst char *filename, > * 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, const char *filename, > - QDict **options, int flags, Error **errp) > +static int bdrv_file_open(BlockDriverState *bs, QDict **options, int f= lags, > + Error **errp) > { > BlockDriver *drv; > + const char *filename; > const char *drvname; > Error *local_err =3D NULL; > int ret; > =20 > - ret =3D bdrv_fill_options(options, filename, &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > - return ret; > - } > - > filename =3D qdict_get_try_str(*options, "filename"); > drvname =3D qdict_get_str(*options, "driver"); > =20 > @@ -1443,12 +1443,18 @@ int bdrv_open(BlockDriverState **pbs, const cha= r *filename, > filename =3D NULL; > } > =20 > + ret =3D bdrv_fill_options(&options, filename, flags, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return ret; Chance are that bs and option where created above. goto fail ? > + } > + > bs->options =3D options; > options =3D qdict_clone_shallow(options); > =20 > if (flags & BDRV_O_PROTOCOL) { > assert(!drv); > - ret =3D bdrv_file_open(bs, filename, &options, flags & ~BDRV_O= _PROTOCOL, > + ret =3D bdrv_file_open(bs, &options, flags & ~BDRV_O_PROTOCOL, > &local_err); > if (!ret) { > drv =3D bs->drv; > --=20 > 1.8.3.1 >=20 >=20