Skip to content

Commit

Permalink
block: Drop drv parameter from bdrv_open()
Browse files Browse the repository at this point in the history 
Now that this parameter is effectively unused, we can drop it and just
pass NULL on to bdrv_open_inherit().

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
@XanClic @kevmw
XanClic authored and kevmw committed Sep 14, 2015
1 parent e664171 commit 6ebf9aa
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 29 deletions.
9 changes: 4 additions & 5 deletions block.c
View file
Expand Up @@ -1391,7 +1391,7 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp)
bs_snapshot = bdrv_new();

ret = bdrv_open(&bs_snapshot, NULL, NULL, snapshot_options,
flags, NULL, &local_err);
flags, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto out;
Expand Down Expand Up @@ -1637,11 +1637,10 @@ static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename,
}

int bdrv_open(BlockDriverState **pbs, const char *filename,
const char *reference, QDict *options, int flags,
BlockDriver *drv, Error **errp)
const char *reference, QDict *options, int flags, Error **errp)
{
return bdrv_open_inherit(pbs, filename, reference, options, flags, NULL,
NULL, drv, errp);
NULL, NULL, errp);
}

typedef struct BlockReopenQueueEntry {
Expand Down Expand Up @@ -3846,7 +3845,7 @@ void bdrv_img_create(const char *filename, const char *fmt,

bs = NULL;
ret = bdrv_open(&bs, full_backing, NULL, backing_options,
back_flags, NULL, &local_err);
back_flags, &local_err);
g_free(full_backing);
if (ret < 0) {
goto out;
Expand Down
2 changes: 1 addition & 1 deletion block/block-backend.c
View file
Expand Up @@ -126,7 +126,7 @@ BlockBackend *blk_new_open(const char *name, const char *filename,
return NULL;
}

ret = bdrv_open(&blk->bs, filename, reference, options, flags, NULL, errp);
ret = bdrv_open(&blk->bs, filename, reference, options, flags, errp);
if (ret < 0) {
blk_unref(blk);
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion block/parallels.c
View file
Expand Up @@ -476,7 +476,7 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp)

file = NULL;
ret = bdrv_open(&file, filename, NULL, NULL,
BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err);
BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
return ret;
Expand Down
2 changes: 1 addition & 1 deletion block/qcow.c
View file
Expand Up @@ -793,7 +793,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp)

qcow_bs = NULL;
ret = bdrv_open(&qcow_bs, filename, NULL, NULL,
BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err);
BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto cleanup;
Expand Down
6 changes: 3 additions & 3 deletions block/qcow2.c
View file
Expand Up @@ -1975,7 +1975,7 @@ static int qcow2_create2(const char *filename, int64_t total_size,

bs = NULL;
ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, &local_err);
&local_err);
if (ret < 0) {
error_propagate(errp, local_err);
return ret;
Expand Down Expand Up @@ -2038,7 +2038,7 @@ static int qcow2_create2(const char *filename, int64_t total_size,
qdict_put(options, "driver", qstring_from_str("qcow2"));
ret = bdrv_open(&bs, filename, NULL, options,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH,
NULL, &local_err);
&local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto out;
Expand Down Expand Up @@ -2092,7 +2092,7 @@ static int qcow2_create2(const char *filename, int64_t total_size,
qdict_put(options, "driver", qstring_from_str("qcow2"));
ret = bdrv_open(&bs, filename, NULL, options,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_BACKING,
NULL, &local_err);
&local_err);
if (local_err) {
error_propagate(errp, local_err);
goto out;
Expand Down
2 changes: 1 addition & 1 deletion block/qed.c
View file
Expand Up @@ -583,7 +583,7 @@ static int qed_create(const char *filename, uint32_t cluster_size,

bs = NULL;
ret = bdrv_open(&bs, filename, NULL, NULL,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, NULL,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,
&local_err);
if (ret < 0) {
error_propagate(errp, local_err);
Expand Down
5 changes: 2 additions & 3 deletions block/sheepdog.c
View file
Expand Up @@ -1554,7 +1554,7 @@ static int sd_prealloc(const char *filename, Error **errp)
int ret;

ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, errp);
errp);
if (ret < 0) {
goto out_with_err_set;
}
Expand Down Expand Up @@ -1746,8 +1746,7 @@ static int sd_create(const char *filename, QemuOpts *opts,
}

bs = NULL;
ret = bdrv_open(&bs, backing_file, NULL, NULL, BDRV_O_PROTOCOL, NULL,
errp);
ret = bdrv_open(&bs, backing_file, NULL, NULL, BDRV_O_PROTOCOL, errp);
if (ret < 0) {
goto out;
}
Expand Down
2 changes: 1 addition & 1 deletion block/vdi.c
View file
Expand Up @@ -764,7 +764,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
goto exit;
}
ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, &local_err);
&local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto exit;
Expand Down
2 changes: 1 addition & 1 deletion block/vhdx.c
View file
Expand Up @@ -1842,7 +1842,7 @@ static int vhdx_create(const char *filename, QemuOpts *opts, Error **errp)

bs = NULL;
ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, &local_err);
&local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto exit;
Expand Down
7 changes: 3 additions & 4 deletions block/vmdk.c
View file
Expand Up @@ -1632,7 +1632,7 @@ static int vmdk_create_extent(const char *filename, int64_t filesize,

assert(bs == NULL);
ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, &local_err);
&local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto exit;
Expand Down Expand Up @@ -1905,8 +1905,7 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp)
ret = -ENOENT;
goto exit;
}
ret = bdrv_open(&bs, full_backing, NULL, NULL, BDRV_O_NO_BACKING, NULL,
errp);
ret = bdrv_open(&bs, full_backing, NULL, NULL, BDRV_O_NO_BACKING, errp);
g_free(full_backing);
if (ret != 0) {
goto exit;
Expand Down Expand Up @@ -1977,7 +1976,7 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp)
}
assert(new_bs == NULL);
ret = bdrv_open(&new_bs, filename, NULL, NULL,
BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err);
BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto exit;
Expand Down
2 changes: 1 addition & 1 deletion block/vpc.c
View file
Expand Up @@ -794,7 +794,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp)
goto out;
}
ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, &local_err);
&local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto out;
Expand Down
2 changes: 1 addition & 1 deletion block/vvfat.c
View file
Expand Up @@ -2962,7 +2962,7 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp)
qdict_put(options, "driver", qstring_from_str("qcow"));
ret = bdrv_open(&s->qcow, s->qcow_filename, NULL, options,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH,
NULL, errp);
errp);
if (ret < 0) {
goto err;
}
Expand Down
8 changes: 4 additions & 4 deletions blockdev.c
View file
Expand Up @@ -1527,7 +1527,7 @@ static void external_snapshot_prepare(BlkTransactionState *common,
* extended QMP command? */
assert(state->new_bs == NULL);
ret = bdrv_open(&state->new_bs, new_image_file, NULL, options,
flags | BDRV_O_NO_BACKING, NULL, &local_err);
flags | BDRV_O_NO_BACKING, &local_err);
/* We will manually add the backing_hd field to the bs later */
if (ret != 0) {
error_propagate(errp, local_err);
Expand Down Expand Up @@ -1901,7 +1901,7 @@ static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename,
qdict_put(options, "driver", qstring_from_str(format));
}

ret = bdrv_open(&bs, filename, NULL, options, bdrv_flags, NULL, &local_err);
ret = bdrv_open(&bs, filename, NULL, options, bdrv_flags, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
return;
Expand Down Expand Up @@ -2546,7 +2546,7 @@ void qmp_drive_backup(const char *device, const char *target,
}

target_bs = NULL;
ret = bdrv_open(&target_bs, target, NULL, options, flags, NULL, &local_err);
ret = bdrv_open(&target_bs, target, NULL, options, flags, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto out;
Expand Down Expand Up @@ -2801,7 +2801,7 @@ void qmp_drive_mirror(const char *device, const char *target,
*/
target_bs = NULL;
ret = bdrv_open(&target_bs, target, NULL, options,
flags | BDRV_O_NO_BACKING, NULL, &local_err);
flags | BDRV_O_NO_BACKING, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto out;
Expand Down
3 changes: 1 addition & 2 deletions include/block/block.h
View file
Expand Up @@ -218,8 +218,7 @@ void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd);
int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp);
int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp);
int bdrv_open(BlockDriverState **pbs, const char *filename,
const char *reference, QDict *options, int flags,
BlockDriver *drv, Error **errp);
const char *reference, QDict *options, int flags, Error **errp);
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
BlockDriverState *bs, int flags);
int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp);
Expand Down

0 comments on commit 6ebf9aa

Please sign in to comment.