[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/5] block/raw-posix: Implement bdrv_parse_filename(
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 2/5] block/raw-posix: Implement bdrv_parse_filename() |
Date: |
Wed, 5 Mar 2014 22:41:37 +0100 |
The "file" protocol driver should strip the "file:" prefix from
filenames if present.
Signed-off-by: Max Reitz <address@hidden>
---
block/raw-posix.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 161ea14..892145c 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,
--
1.9.0
- [Qemu-devel] [PATCH 0/5] block/raw: Strip "file:" prefix from filenames, Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 1/5] block: Keep "filename" option after parsing, Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 2/5] block/raw-posix: Implement bdrv_parse_filename(),
Max Reitz <=
- [Qemu-devel] [PATCH 3/5] block/raw-posix: Strip "file:" prefix on creation, Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 4/5] block/raw-win32: Implement bdrv_parse_filename(), Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 5/5] block/raw-win32: Strip "file:" prefix on creation, Max Reitz, 2014/03/05
- Re: [Qemu-devel] [PATCH 0/5] block/raw: Strip "file:" prefix from filenames, Eric Blake, 2014/03/05
- Re: [Qemu-devel] [PATCH 0/5] block/raw: Strip "file:" prefix from filenames, Kevin Wolf, 2014/03/06