From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48465)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WLgwM-0000bO-8j
	for qemu-devel@nongnu.org; Thu, 06 Mar 2014 17:39:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WLgwH-0004Ci-91
	for qemu-devel@nongnu.org; Thu, 06 Mar 2014 17:38:58 -0500
Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:55876 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WLgwH-0004Cd-2M
	for qemu-devel@nongnu.org; Thu, 06 Mar 2014 17:38:53 -0500
Date: Thu, 6 Mar 2014 23:38:53 +0100
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140306223853.GC28835@irqsave.net>
References: <1394144739-2294-1-git-send-email-mreitz@redhat.com>
	<1394144739-2294-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: <1394144739-2294-3-git-send-email-mreitz@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 2/5] block/raw-posix: bdrv_parse_filename()
	for floppy
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>, =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>

The Thursday 06 Mar 2014 =E0 23:25:36 (+0100), Max Reitz wrote :
> The "host_floppy" protocol driver should strip the "host_floppy:" prefi=
x
> from filenames if present.
>=20
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block/raw-posix.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>=20
> diff --git a/block/raw-posix.c b/block/raw-posix.c
> index ab32ff9..4b8c183 100644
> --- a/block/raw-posix.c
> +++ b/block/raw-posix.c
> @@ -1844,6 +1844,15 @@ static BlockDriver bdrv_host_device =3D {
>  };
> =20
>  #ifdef __linux__
> +static void floppy_parse_filename(const char *filename, QDict *options=
,
> +                                  Error **errp)
> +{
> +    /* The prefix is optional, just as for "file". */
> +    strstart(filename, "host_floppy:", &filename);
> +
> +    qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filena=
me)));
> +}
> +
>  static int floppy_open(BlockDriverState *bs, QDict *options, int flags=
,
>                         Error **errp)
>  {
> @@ -1949,6 +1958,7 @@ static BlockDriver bdrv_host_floppy =3D {
>      .instance_size      =3D sizeof(BDRVRawState),
>      .bdrv_needs_filename =3D true,
>      .bdrv_probe_device	=3D floppy_probe_device,
> +    .bdrv_parse_filename =3D floppy_parse_filename,
>      .bdrv_file_open     =3D floppy_open,
>      .bdrv_close         =3D raw_close,
>      .bdrv_reopen_prepare =3D raw_reopen_prepare,
> --=20
> 1.9.0
>=20
Reviewed-by: Benoit Canet <benoit@irqsave.net>