From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7cN1-0005qO-Mi for qemu-devel@nongnu.org; Sun, 26 Jan 2014 21:56:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7cMw-000499-Hm for qemu-devel@nongnu.org; Sun, 26 Jan 2014 21:56:19 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:48412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7cMw-000495-6l for qemu-devel@nongnu.org; Sun, 26 Jan 2014 21:56:14 -0500 Date: Mon, 27 Jan 2014 03:56:15 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140127025614.GD7415@irqsave.net> References: <1390762963-25538-1-git-send-email-mreitz@redhat.com> <1390762963-25538-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: <1390762963-25538-6-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 05/10] block: Reuse reference handling from bdrv_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:38 (+0100), Max Reitz a =E9crit : > Remove the reference parameter and the related handling code from > bdrv_file_open(), since it exists in bdrv_open() now as well. >=20 > Signed-off-by: Max Reitz > --- > block.c | 33 +++++++-------------------------- > 1 file changed, 7 insertions(+), 26 deletions(-) >=20 > diff --git a/block.c b/block.c > index c7219cb..6c29115 100644 > --- a/block.c > +++ b/block.c > @@ -948,8 +948,7 @@ free_and_fail: > * dictionary, it needs to use QINCREF() before calling bdrv_file_open= . > */ > static int bdrv_file_open(BlockDriverState **pbs, const char *filename= , > - const char *reference, QDict *options, int f= lags, > - Error **errp) > + QDict *options, int flags, Error **errp) > { > BlockDriverState *bs =3D NULL; > BlockDriver *drv; > @@ -958,24 +957,6 @@ static int bdrv_file_open(BlockDriverState **pbs, = const char *filename, > Error *local_err =3D NULL; > int ret; > =20 > - if (reference) { > - if (filename || qdict_size(options)) { > - error_setg(errp, "Cannot reference an existing block devic= e with " > - "additional options or a new filename"); > - return -EINVAL; > - } > - QDECREF(options); > - > - bs =3D bdrv_find(reference); > - if (!bs) { > - error_setg(errp, "Cannot find block device '%s'", referenc= e); > - return -ENODEV; > - } > - bdrv_ref(bs); > - *pbs =3D bs; > - return 0; > - } > - > bs =3D bdrv_new(""); > bs->options =3D options; > options =3D qdict_clone_shallow(options); > @@ -1228,12 +1209,6 @@ int bdrv_open(BlockDriverState **pbs, const char= *filename, > options =3D qdict_new(); > } > =20 > - if (flags & BDRV_O_PROTOCOL) { > - assert(!drv); > - return bdrv_file_open(pbs, filename, reference, options, > - flags & ~BDRV_O_PROTOCOL, errp); > - } > - > if (reference) { > bool options_non_empty =3D qdict_size(options); > QDECREF(options); > @@ -1260,6 +1235,12 @@ int bdrv_open(BlockDriverState **pbs, const char= *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 { > --=20 > 1.8.5.3 >=20 >=20 Reviewed-by: Benoit Canet