[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/47] block: Remove second bdrv_open() recursion
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 13/47] block: Remove second bdrv_open() recursion |
Date: |
Fri, 27 Jun 2014 21:08:32 +0200 |
This recursion was introduced in commit 505d7583 in order to allow
nesting image formats. It only ever takes effect when the user
explicitly specifies a driver name and that driver isn't suitable for
the protocol level.
We can check this earlier in bdrv_open() and if the explicitly
requested driver is a format driver, clear BDRV_O_PROTOCOL so that
another bs->file layer is opened.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block.c | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/block.c b/block.c
index dfe2c75..0978e8c 100644
--- a/block.c
+++ b/block.c
@@ -1404,6 +1404,26 @@ int bdrv_open(BlockDriverState **pbs, const char
*filename,
goto fail;
}
+ /* Find the right image format driver */
+ drv = NULL;
+ drvname = qdict_get_try_str(options, "driver");
+ if (drvname) {
+ drv = bdrv_find_format(drvname);
+ qdict_del(options, "driver");
+ if (!drv) {
+ error_setg(errp, "Unknown driver: '%s'", drvname);
+ ret = -EINVAL;
+ goto fail;
+ }
+ }
+
+ assert(drvname || !(flags & BDRV_O_PROTOCOL));
+ if (drv && !drv->bdrv_file_open) {
+ /* If the user explicitly wants a format driver here, we'll need to add
+ * another layer for the protocol in bs->file */
+ flags &= ~BDRV_O_PROTOCOL;
+ }
+
bs->options = options;
options = qdict_clone_shallow(options);
@@ -1426,25 +1446,13 @@ int bdrv_open(BlockDriverState **pbs, const char
*filename,
}
}
- /* Find the right image format driver */
- drv = NULL;
- drvname = qdict_get_try_str(options, "driver");
- assert(drvname || !(flags & BDRV_O_PROTOCOL));
-
- if (drvname) {
- drv = bdrv_find_format(drvname);
- qdict_del(options, "driver");
- if (!drv) {
- error_setg(errp, "Unknown driver: '%s'", drvname);
- ret = -EINVAL;
- goto fail;
- }
- } else if (file) {
+ /* Image format probing */
+ if (!drv && file) {
ret = find_image_format(file, filename, &drv, &local_err);
if (ret < 0) {
goto fail;
}
- } else {
+ } else if (!drv) {
error_setg(errp, "Must specify either driver or file");
ret = -EINVAL;
goto fail;
@@ -1452,16 +1460,8 @@ int bdrv_open(BlockDriverState **pbs, const char
*filename,
/* Open the image */
if (flags & BDRV_O_PROTOCOL) {
- if (!drv->bdrv_file_open) {
- const char *filename;
- filename = qdict_get_try_str(options, "filename");
- ret = bdrv_open(&bs, filename, NULL, options,
- flags & ~BDRV_O_PROTOCOL, drv, &local_err);
- options = NULL;
- } else {
- ret = bdrv_open_common(bs, NULL, options,
- flags & ~BDRV_O_PROTOCOL, drv, &local_err);
- }
+ ret = bdrv_open_common(bs, NULL, options,
+ flags & ~BDRV_O_PROTOCOL, drv, &local_err);
if (!ret) {
bs->growable = 1;
goto done;
--
1.8.3.1
- [Qemu-devel] [PULL 06/47] block/nfs: add knob to set readahead, (continued)
- [Qemu-devel] [PULL 06/47] block/nfs: add knob to set readahead, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 05/47] block/nfs: fix url parameter checking, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 03/47] qemu-iotests: Test BLOCK_JOB_READY event for 0Kb image active commit, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 04/47] qemu-iotests: Test 0-length image for mirror, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 08/47] block: Move bdrv_fill_options() call to bdrv_open(), Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 07/47] block: Create bdrv_fill_options(), Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 09/47] block: Move json: parsing to bdrv_fill_options(), Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 11/47] block: Use common driver selection code for bdrv_open_file(), Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 12/47] block: Inline bdrv_file_open(), Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 10/47] block: Always pass driver name through options QDict, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 13/47] block: Remove second bdrv_open() recursion,
Kevin Wolf <=
- [Qemu-devel] [PULL 14/47] block: Catch backing files assigned to non-COW drivers, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 18/47] block: add qemu-iotest for resize base during live commit, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 16/47] qemu_opts_append: Play nicely with QemuOptsList's head, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 17/47] block: check for RESIZE blocker in the QMP command, not bdrv_truncate(), Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 15/47] block: Remove a special case for protocols, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 19/47] quorum: Add the rewrite-corrupted parameter to quorum, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 20/47] block: Add node-name argument to drive-mirror, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 22/47] virtio-blk: Convert VirtIOBlockReq.elem to pointer, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 23/47] virtio-blk: Drop bounce buffer from dataplane code, Kevin Wolf, 2014/06/27
- [Qemu-devel] [PULL 24/47] virtio-blk: Drop VirtIOBlockRequest.read, Kevin Wolf, 2014/06/27