From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52990)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1W7cbC-0000qq-BY
	for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:11:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1W7cb6-0008BB-Cl
	for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:10:58 -0500
Received: from paradis.irqsave.net ([62.212.105.220]:48418)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1W7cb6-0008B7-2X
	for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:10:52 -0500
Date: Mon, 27 Jan 2014 04:10:52 +0100
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140127031052.GF7415@irqsave.net>
References: <1390762963-25538-1-git-send-email-mreitz@redhat.com>
	<1390762963-25538-8-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-8-git-send-email-mreitz@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 07/10] block: Reuse fail path from
 bdrv_open()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Max Reitz <mreitz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>

Le Sunday 26 Jan 2014 =E0 20:02:40 (+0100), Max Reitz a =E9crit :
> The fail paths of bdrv_file_open() and bdrv_open() naturally exhibit
> similarities, thus it is possible to reuse the one from bdrv_open() and
> shorten the one in bdrv_file_open() accordingly.
>=20
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block.c | 17 +++++++----------
>  1 file changed, 7 insertions(+), 10 deletions(-)
>=20
> diff --git a/block.c b/block.c
> index 72eddd5..0f2cd3f 100644
> --- a/block.c
> +++ b/block.c
> @@ -1038,9 +1038,6 @@ static int bdrv_file_open(BlockDriverState *bs, c=
onst char *filename,
> =20
>  fail:
>      QDECREF(options);
> -    if (!bs->drv) {
> -        QDECREF(bs->options);
> -    }
>      return ret;
>  }
> =20
> @@ -1240,17 +1237,17 @@ int bdrv_open(BlockDriverState **pbs, const cha=
r *filename,
>      if (flags & BDRV_O_PROTOCOL) {
>          assert(!drv);
>          ret =3D bdrv_file_open(bs, filename, options, flags & ~BDRV_O_=
PROTOCOL,
> -                             errp);
> +                             &local_err);
> +        options =3D NULL;
>          if (ret) {
> -            if (*pbs) {
> -                bdrv_close(bs);
> +            if (bs->drv) {
> +                goto close_and_fail;
>              } else {
> -                bdrv_unref(bs);
> +                goto fail;
>              }
> -        } else {
> -            *pbs =3D bs;
>          }

Forget what I said about the goto chain in the previous mail.

But something like:

    if(!ret) {
        *pbs =3D bs;
        return 0;
    }
    if (bs->drv) {
        goto close_and_fail;
    }
    goto fail;

would keep the code in line.

Best regards

Beno=EEt

> +        *pbs =3D bs;
> +        return 0;
>      }
> =20
>      bs->options =3D options;
> --=20
> 1.8.5.3
>=20
>=20