The Saturday 08 Mar 2014 à 00:39:43 (+0100), Max Reitz wrote :
> The "host_cdrom" protocol drivers should strip the "host_cdrom:" prefix
> from filenames if present.
>
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> block/raw-posix.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> 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 = {
> .bdrv_media_changed = floppy_media_changed,
> .bdrv_eject = floppy_eject,
> };
> +#endif
>
> +#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> +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(filename)));
> +}
> +#endif
> +
> +#ifdef __linux__
> static int cdrom_open(BlockDriverState *bs, QDict *options, int flags,
> Error **errp)
> {
> @@ -2070,6 +2083,7 @@ static BlockDriver bdrv_host_cdrom = {
> .instance_size = sizeof(BDRVRawState),
> .bdrv_needs_filename = true,
> .bdrv_probe_device = cdrom_probe_device,
> + .bdrv_parse_filename = cdrom_parse_filename,
> .bdrv_file_open = cdrom_open,
> .bdrv_close = raw_close,
> .bdrv_reopen_prepare = raw_reopen_prepare,
> @@ -2200,6 +2214,7 @@ static BlockDriver bdrv_host_cdrom = {
> .instance_size = sizeof(BDRVRawState),
> .bdrv_needs_filename = true,
> .bdrv_probe_device = cdrom_probe_device,
> + .bdrv_parse_filename = cdrom_parse_filename,
> .bdrv_file_open = cdrom_open,
> .bdrv_close = raw_close,
> .bdrv_reopen_prepare = raw_reopen_prepare,
> --
> 1.9.0
>
Reviewed-by: Benoit Canet <ben...@irqsave.net>
