diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-03-05 22:41:37 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-03-06 16:18:06 +0100 |
| commit | 078896a9eeeaf7c301bbc59fc791c3331324285f (patch) | |
| tree | 8b7c3d1cce27f447cf788a5790d1c1007cd62139 /block | |
| parent | cd5d031e75751838fb40f7b5a5f60fc15d543c55 (diff) | |
| download | qemu-078896a9eeeaf7c301bbc59fc791c3331324285f.zip | |
block/raw-posix: Implement bdrv_parse_filename()
The "file" protocol driver should strip the "file:" prefix from
filenames if present.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/raw-posix.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index 161ea14812..892145ce08 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -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, |