Commit 078896a9 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block/raw-posix: Implement bdrv_parse_filename() 



The "file" protocol driver should strip the "file:" prefix from
filenames if present.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarBenoit Canet <benoit@irqsave.net>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent cd5d031e

block/raw-posix.c

+12 −0
Original line number Diff line number Diff line
@@ -336,6 +336,17 @@ error: 
}

#endif



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(filename)));

}



static QemuOptsList raw_runtime_opts = {

    .name = "raw",

    .head = QTAILQ_HEAD_INITIALIZER(raw_runtime_opts.head),
@@ -1412,6 +1423,7 @@ static BlockDriver bdrv_file = { 
    .instance_size = sizeof(BDRVRawState),

    .bdrv_needs_filename = true,

    .bdrv_probe = NULL, /* no probe for protocols */

    .bdrv_parse_filename = raw_parse_filename,

    .bdrv_file_open = raw_open,

    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit = raw_reopen_commit,