[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename() |
Date: |
Fri, 7 Mar 2014 14:32:58 +0100 |
From: Max Reitz <address@hidden>
The "file" protocol driver should strip the "file:" prefix from
filenames if present.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Kevin Wolf <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.8.1.4
- [Qemu-devel] [PULL 00/19] Block patches, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 01/19] gluster: Change licence to GPLv2+, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 04/19] qemu-iotests: Test progress output for conversion, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 02/19] gluster: Remove unused defines and header include, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 05/19] iscsi: Use bs->sg for everything else than disks, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 06/19] block: Fix bs->request_alignment assertion for bs->sg=1, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph node list field., Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 08/19] block: mirror - remove code cruft that has no function, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename(),
Kevin Wolf <=
- [Qemu-devel] [PULL 12/19] block/raw-win32: Implement bdrv_parse_filename(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 11/19] block/raw-posix: Strip "file:" prefix on creation, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 13/19] block/raw-win32: Strip "file:" prefix on creation, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 15/19] blockdev: Fix NULL pointer dereference in blockdev-add, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 16/19] qemu-iotests: Test a few blockdev-add error cases, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 14/19] blockdev: Fail blockdev-add with encrypted images, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 17/19] block: Fix error path segfault in bdrv_open(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 19/19] block: qemu-iotests 085 - live snapshots tests, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 18/19] hw/ide/ahci.h: Avoid shifting left into sign bit, Kevin Wolf, 2014/03/07
- Re: [Qemu-devel] [PULL 00/19] Block patches, Peter Maydell, 2014/03/08