From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44441)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WLXxY-0005hh-He
	for qemu-devel@nongnu.org; Thu, 06 Mar 2014 08:03:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WLXxT-0001Ga-6L
	for qemu-devel@nongnu.org; Thu, 06 Mar 2014 08:03:36 -0500
Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:55827 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WLXxT-0001GQ-0J
	for qemu-devel@nongnu.org; Thu, 06 Mar 2014 08:03:31 -0500
Date: Thu, 6 Mar 2014 14:03:30 +0100
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140306130330.GC3132@irqsave.net>
References: <1394055700-5988-1-git-send-email-mreitz@redhat.com>
	<1394055700-5988-3-git-send-email-mreitz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <1394055700-5988-3-git-send-email-mreitz@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 2/5] block/raw-posix: Implement
 bdrv_parse_filename()
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>

The Wednesday 05 Mar 2014 =E0 22:41:37 (+0100), Max Reitz wrote :
> The "file" protocol driver should strip the "file:" prefix from
> filenames if present.
>=20
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block/raw-posix.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>=20
> diff --git a/block/raw-posix.c b/block/raw-posix.c
> index 161ea14..892145c 100644
> --- a/block/raw-posix.c
> +++ b/block/raw-posix.c
> @@ -336,6 +336,17 @@ error:
>  }
>  #endif
> =20
> +static void raw_parse_filename(const char *filename, QDict *options,
> +                               Error **errp)
> +{
> +    /* The filename does not have to be prefixed by the protocol name,=
 since
> +     * "file" is the default protocol; therefore, the return value of =
this
> +     * function call can be ignored. */
> +    strstart(filename, "file:", &filename);
> +
> +    qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filena=
me)));
> +}
> +
>  static QemuOptsList raw_runtime_opts =3D {
>      .name =3D "raw",
>      .head =3D QTAILQ_HEAD_INITIALIZER(raw_runtime_opts.head),
> @@ -1412,6 +1423,7 @@ static BlockDriver bdrv_file =3D {
>      .instance_size =3D sizeof(BDRVRawState),
>      .bdrv_needs_filename =3D true,
>      .bdrv_probe =3D NULL, /* no probe for protocols */
> +    .bdrv_parse_filename =3D raw_parse_filename,
>      .bdrv_file_open =3D raw_open,
>      .bdrv_reopen_prepare =3D raw_reopen_prepare,
>      .bdrv_reopen_commit =3D raw_reopen_commit,
> --=20
> 1.9.0
>=20
>=20
Reviewed-by: Benoit Canet <benoit@irqsave.net>