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 mre...@redhat.com
---
block.c | 9 -
block/block-backend.c | 2 +-
block/parallels.c | 2 +-
block/qcow.c | 2 +-
block/qcow2.c | 6 +++---
block/qed.c | 2 +-
block/sheepdog.c | 5 ++---
block/vdi.c | 2 +-
block/vhdx.c | 2 +-
block/vmdk.c | 7 +++
block/vpc.c | 2 +-
block/vvfat.c | 2 +-
blockdev.c| 8
include/block/block.h | 3 +--
14 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/block.c b/block.c
index 193daf9..ac89487 100644
--- a/block.c
+++ b/block.c
@@ -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;
@@ -1637,11 +1637,10 @@ close_and_fail:
}
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 {
@@ -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;
diff --git a/block/block-backend.c b/block/block-backend.c
index aee8a12..c2e8732 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -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;
diff --git a/block/parallels.c b/block/parallels.c
index 046b568..5cd6ec3 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -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;
diff --git a/block/qcow.c b/block/qcow.c
index 01fba54..6e35db1 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -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;
diff --git a/block/qcow2.c b/block/qcow2.c
index 867b43b..a707d8d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -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;
@@ -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;
@@ -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;
diff --git a/block/qed.c b/block/qed.c
index 954ed00..a7ff1d9 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -583,7 +583,7 @@ static int qed_create(const char *filename, uint32_t
