[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/21] block: Allow recursive "file"s
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 11/21] block: Allow recursive "file"s |
Date: |
Wed, 11 Dec 2013 19:11:03 +0100 |
It should be possible to use a format as a driver for a file which in
turn requires another file, i.e., nesting file formats.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 33ef995..bebf080 100644
--- a/block.c
+++ b/block.c
@@ -950,14 +950,19 @@ int bdrv_file_open(BlockDriverState **pbs, const char
*filename,
goto fail;
}
- ret = bdrv_open_common(bs, NULL, options, flags, drv, &local_err);
+ if (!drv->bdrv_file_open) {
+ ret = bdrv_open(bs, filename, options, flags, drv, &local_err);
+ options = NULL;
+ } else {
+ ret = bdrv_open_common(bs, NULL, options, flags, drv, &local_err);
+ }
if (ret < 0) {
error_propagate(errp, local_err);
goto fail;
}
/* Check if any unknown options were used */
- if (qdict_size(options) != 0) {
+ if (options && (qdict_size(options) != 0)) {
const QDictEntry *entry = qdict_first(options);
error_setg(errp, "Block protocol '%s' doesn't support the option '%s'",
drv->format_name, entry->key);
@@ -972,10 +977,12 @@ int bdrv_file_open(BlockDriverState **pbs, const char
*filename,
fail:
QDECREF(options);
- if (!bs->drv) {
- QDECREF(bs->options);
+ if (bs) {
+ if (!bs->drv) {
+ QDECREF(bs->options);
+ }
+ bdrv_unref(bs);
}
- bdrv_unref(bs);
return ret;
}
--
1.8.5.1
- [Qemu-devel] [PATCH v3 02/21] blkdebug: Don't require sophisticated filename, (continued)
- [Qemu-devel] [PATCH v3 02/21] blkdebug: Don't require sophisticated filename, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 03/21] qdict: Add qdict_array_split(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 04/21] qapi: extend qdict_flatten() for QLists, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 05/21] qemu-option: Add qemu_config_parse_qdict(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 06/21] blkdebug: Always call read_config(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 07/21] blkdebug: Use command-line in read_config(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 08/21] block: Allow reference for bdrv_file_open(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 09/21] block: Pass reference to bdrv_file_open(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 10/21] block: Allow block devices without files, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 11/21] block: Allow recursive "file"s,
Max Reitz <=
- [Qemu-devel] [PATCH v3 12/21] qemu-iotests: Fix output of test 051, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 13/21] blockdev: Move "file" to legacy_opts, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 14/21] blkdebug: Allow command-line file configuration, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 15/21] blkdebug: Make filename optional, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 16/21] blkverify: Allow command-line configuration, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 17/21] blkverify: Don't require protocol filename, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 19/21] qapi: QMP interface for blkdebug and blkverify, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 18/21] blkdebug: Alias "errno" as "error", Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 20/21] qemu-io: Make filename optional, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 21/21] iotests: Test new blkdebug/blkverify interface, Max Reitz, 2013/12/11