[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/54] block: Remove bdrv_new() from bdrv_file_open()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 07/54] block: Remove bdrv_new() from bdrv_file_open() |
Date: |
Fri, 21 Feb 2014 23:12:04 +0100 |
From: Max Reitz <address@hidden>
Change bdrv_file_open() to take a simple pointer to an already existing
BDS instead of an indirect one. The BDS will be created in bdrv_open()
if necessary.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/block.c b/block.c
index 29accdd..39f2b60 100644
--- a/block.c
+++ b/block.c
@@ -960,10 +960,9 @@ free_and_fail:
* after the call (even on failure), so if the caller intends to reuse the
* dictionary, it needs to use QINCREF() before calling bdrv_file_open.
*/
-static int bdrv_file_open(BlockDriverState **pbs, const char *filename,
+static int bdrv_file_open(BlockDriverState *bs, const char *filename,
QDict *options, int flags, Error **errp)
{
- BlockDriverState *bs = NULL;
BlockDriver *drv;
const char *drvname;
bool allow_protocol_prefix = false;
@@ -975,7 +974,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const
char *filename,
options = qdict_new();
}
- bs = bdrv_new("");
bs->options = options;
options = qdict_clone_shallow(options);
@@ -1049,7 +1047,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const
char *filename,
QDECREF(options);
bs->growable = 1;
- *pbs = bs;
return 0;
fail:
@@ -1057,7 +1054,6 @@ fail:
if (!bs->drv) {
QDECREF(bs->options);
}
- bdrv_unref(bs);
return ret;
}
@@ -1252,18 +1248,24 @@ int bdrv_open(BlockDriverState **pbs, const char
*filename,
return 0;
}
- if (flags & BDRV_O_PROTOCOL) {
- assert(!drv);
- return bdrv_file_open(pbs, filename, options, flags & ~BDRV_O_PROTOCOL,
- errp);
- }
-
if (*pbs) {
bs = *pbs;
} else {
bs = bdrv_new("");
}
+ if (flags & BDRV_O_PROTOCOL) {
+ assert(!drv);
+ ret = bdrv_file_open(bs, filename, options, flags & ~BDRV_O_PROTOCOL,
+ errp);
+ if (ret && !*pbs) {
+ bdrv_unref(bs);
+ } else if (!ret) {
+ *pbs = bs;
+ }
+ return ret;
+ }
+
/* NULL means an empty set of options */
if (options == NULL) {
options = qdict_new();
--
1.8.1.4
- [Qemu-devel] [PULL 00/54] Block patches, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 02/54] block: Fix bdrv_is_first_non_filter(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 01/54] qcow2: Set zero flag for discarded clusters, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 03/54] block: Change BDS parameter of bdrv_open() to **, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 05/54] block: Make bdrv_file_open() static, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 04/54] block: Add reference parameter to bdrv_open(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 06/54] block: Reuse reference handling from bdrv_open(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 07/54] block: Remove bdrv_new() from bdrv_file_open(),
Kevin Wolf <=
- [Qemu-devel] [PULL 08/54] block: Handle bs->options in bdrv_open() only, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 09/54] block: Reuse success path from bdrv_open(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 10/54] block: Remove bdrv_open_image()'s force_raw option, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 11/54] nbd: produce a better error if neither host nor port is passed, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 12/54] nbd: correctly propagate errors, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 13/54] nbd: inline tcp_socket_incoming_spec into sole caller, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 14/54] nbd: move socket wrappers to qemu-nbd, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 15/54] iscsi: fix indentation, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 16/54] iscsi: correctly propagate errors in iscsi_open, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 17/54] gluster: default scheme to gluster:// and host to localhost., Kevin Wolf, 2014/02/21