From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMcbh-0002oA-Ba for qemu-devel@nongnu.org; Sun, 09 Mar 2014 08:13:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMcbc-0006w6-A1 for qemu-devel@nongnu.org; Sun, 09 Mar 2014 08:13:29 -0400 Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:55943 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMcbc-0006vw-3g for qemu-devel@nongnu.org; Sun, 09 Mar 2014 08:13:24 -0400 Date: Sun, 9 Mar 2014 13:13:21 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140309121321.GA3307@irqsave.net> References: <1394235585-10500-1-git-send-email-mreitz@redhat.com> <1394235585-10500-4-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1394235585-10500-4-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 3/5] block/raw-posix: bdrv_parse_filename() for cdrom List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , =?iso-8859-1?Q?Beno=EEt?= Canet , qemu-devel@nongnu.org, Stefan Hajnoczi The Saturday 08 Mar 2014 =E0 00:39:43 (+0100), Max Reitz wrote : > The "host_cdrom" protocol drivers should strip the "host_cdrom:" prefix > from filenames if present. >=20 > Signed-off-by: Max Reitz > --- > block/raw-posix.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) >=20 > diff --git a/block/raw-posix.c b/block/raw-posix.c > index 4b8c183..697cd2e 100644 > --- a/block/raw-posix.c > +++ b/block/raw-posix.c > @@ -1983,7 +1983,20 @@ static BlockDriver bdrv_host_floppy =3D { > .bdrv_media_changed =3D floppy_media_changed, > .bdrv_eject =3D floppy_eject, > }; > +#endif > =20 > +#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_ke= rnel__) > +static void cdrom_parse_filename(const char *filename, QDict *options, > + Error **errp) > +{ > + /* The prefix is optional, just as for "file". */ > + strstart(filename, "host_cdrom:", &filename); > + > + qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filena= me))); > +} > +#endif > + > +#ifdef __linux__ > static int cdrom_open(BlockDriverState *bs, QDict *options, int flags, > Error **errp) > { > @@ -2070,6 +2083,7 @@ static BlockDriver bdrv_host_cdrom =3D { > .instance_size =3D sizeof(BDRVRawState), > .bdrv_needs_filename =3D true, > .bdrv_probe_device =3D cdrom_probe_device, > + .bdrv_parse_filename =3D cdrom_parse_filename, > .bdrv_file_open =3D cdrom_open, > .bdrv_close =3D raw_close, > .bdrv_reopen_prepare =3D raw_reopen_prepare, > @@ -2200,6 +2214,7 @@ static BlockDriver bdrv_host_cdrom =3D { > .instance_size =3D sizeof(BDRVRawState), > .bdrv_needs_filename =3D true, > .bdrv_probe_device =3D cdrom_probe_device, > + .bdrv_parse_filename =3D cdrom_parse_filename, > .bdrv_file_open =3D cdrom_open, > .bdrv_close =3D raw_close, > .bdrv_reopen_prepare =3D raw_reopen_prepare, > --=20 > 1.9.0 >=20 Reviewed-by: Benoit Canet