[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/8] block: Reuse reference handling from bdrv_op
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 4/8] block: Reuse reference handling from bdrv_open() |
Date: |
Sat, 15 Feb 2014 04:30:20 +0100 |
Remove the reference parameter and the related handling code from
bdrv_file_open(), since it exists in bdrv_open() now as well.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block.c | 33 +++++++--------------------------
1 file changed, 7 insertions(+), 26 deletions(-)
diff --git a/block.c b/block.c
index a697bce..a1adf93 100644
--- a/block.c
+++ b/block.c
@@ -954,8 +954,7 @@ free_and_fail:
* dictionary, it needs to use QINCREF() before calling bdrv_file_open.
*/
static int bdrv_file_open(BlockDriverState **pbs, const char *filename,
- const char *reference, QDict *options, int flags,
- Error **errp)
+ QDict *options, int flags, Error **errp)
{
BlockDriverState *bs = NULL;
BlockDriver *drv;
@@ -969,24 +968,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const
char *filename,
options = qdict_new();
}
- if (reference) {
- if (filename || qdict_size(options)) {
- error_setg(errp, "Cannot reference an existing block device with "
- "additional options or a new filename");
- return -EINVAL;
- }
- QDECREF(options);
-
- bs = bdrv_find(reference);
- if (!bs) {
- error_setg(errp, "Cannot find block device '%s'", reference);
- return -ENODEV;
- }
- bdrv_ref(bs);
- *pbs = bs;
- return 0;
- }
-
bs = bdrv_new("");
bs->options = options;
options = qdict_clone_shallow(options);
@@ -1239,12 +1220,6 @@ int bdrv_open(BlockDriverState **pbs, const char
*filename,
assert(pbs);
- if (flags & BDRV_O_PROTOCOL) {
- assert(!drv);
- return bdrv_file_open(pbs, filename, reference, options,
- flags & ~BDRV_O_PROTOCOL, errp);
- }
-
if (reference) {
bool options_non_empty = options ? qdict_size(options) : false;
QDECREF(options);
@@ -1271,6 +1246,12 @@ 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 {
--
1.8.5.4
- [Qemu-devel] [PATCH v3 0/8] block: Integrate bdrv_file_open() into bdrv_open(), Max Reitz, 2014/02/14
- [Qemu-devel] [PATCH v3 1/8] block: Change BDS parameter of bdrv_open() to **, Max Reitz, 2014/02/14
- [Qemu-devel] [PATCH v3 2/8] block: Add reference parameter to bdrv_open(), Max Reitz, 2014/02/14
- [Qemu-devel] [PATCH v3 3/8] block: Make bdrv_file_open() static, Max Reitz, 2014/02/14
- [Qemu-devel] [PATCH v3 4/8] block: Reuse reference handling from bdrv_open(),
Max Reitz <=
- [Qemu-devel] [PATCH v3 5/8] block: Remove bdrv_new() from bdrv_file_open(), Max Reitz, 2014/02/14
- [Qemu-devel] [PATCH v3 6/8] block: Handle bs->options in bdrv_open() only, Max Reitz, 2014/02/14
- [Qemu-devel] [PATCH v3 7/8] block: Reuse success path from bdrv_open(), Max Reitz, 2014/02/14
- [Qemu-devel] [PATCH v3 8/8] block: Remove bdrv_open_image()'s force_raw option, Max Reitz, 2014/02/14
- Re: [Qemu-devel] [PATCH v3 0/8] block: Integrate bdrv_file_open() into bdrv_open(), Kevin Wolf, 2014/02/17