From 6ebf9aa2ef7f3e094d91ea27140dc6e73774386a Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 26 Aug 2015 19:47:49 +0200 Subject: block: Drop drv parameter from bdrv_open() 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 Reviewed-by: Alberto Garcia Signed-off-by: Kevin Wolf --- include/block/block.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/block/block.h b/include/block/block.h index 0acd104051..ab4518c957 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -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); -- cgit v1.2.3 From cf25ff850f0b5d44cb79daea88daaf24ce7e4c44 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 26 Aug 2015 19:47:52 +0200 Subject: block: Drop bdrv_find_whitelisted_format() It is unused by now, so we can drop it. Signed-off-by: Max Reitz Reviewed-by: Alberto Garcia Signed-off-by: Kevin Wolf --- include/block/block.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/block/block.h b/include/block/block.h index ab4518c957..e539194320 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -193,8 +193,6 @@ BlockDriver *bdrv_find_protocol(const char *filename, bool allow_protocol_prefix, Error **errp); BlockDriver *bdrv_find_format(const char *format_name); -BlockDriver *bdrv_find_whitelisted_format(const char *format_name, - bool readonly); int bdrv_create(BlockDriver *drv, const char* filename, QemuOpts *opts, Error **errp); int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp); -- cgit v1.2.3 From 4d2cb0925176f3eb75ef8e5f9c02cc84d7930de2 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 10 Apr 2015 17:50:50 +0200 Subject: block: Allow specifying driver-specific options to reopen Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- include/block/block.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/block/block.h b/include/block/block.h index e539194320..ef67353108 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -147,6 +147,7 @@ typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue; typedef struct BDRVReopenState { BlockDriverState *bs; int flags; + QDict *options; void *opaque; } BDRVReopenState; @@ -218,7 +219,8 @@ 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, Error **errp); BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue, - BlockDriverState *bs, int flags); + BlockDriverState *bs, + QDict *options, int flags); int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp); int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp); int bdrv_reopen_prepare(BDRVReopenState *reopen_state, -- cgit v1.2.3