From 56d1b4d21d444619302d3f1291a133b1c2b9b072 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 12 Apr 2013 20:02:37 +0200 Subject: [PATCH] block: Remove filename parameter from .bdrv_file_open() It is unused now in all block drivers. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block.c | 8 ++------ block/blkdebug.c | 3 +-- block/blkverify.c | 3 +-- block/curl.c | 3 +-- block/gluster.c | 4 ++-- block/iscsi.c | 5 ++--- block/nbd.c | 3 +-- block/raw-posix.c | 15 +++++---------- block/raw-win32.c | 6 ++---- block/rbd.c | 3 +-- block/sheepdog.c | 3 +-- block/ssh.c | 3 +-- block/vvfat.c | 3 +-- include/block/block_int.h | 3 +-- 14 files changed, 22 insertions(+), 43 deletions(-) diff --git a/block.c b/block.c index e3464d6b0..6e07f4572 100644 --- a/block.c +++ b/block.c @@ -722,7 +722,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, if (drv->bdrv_file_open) { assert(file == NULL); assert(drv->bdrv_parse_filename || filename != NULL); - ret = drv->bdrv_file_open(bs, filename, options, open_flags); + ret = drv->bdrv_file_open(bs, options, open_flags); } else { if (file == NULL) { qerror_report(ERROR_CLASS_GENERIC_ERROR, "Can't use '%s' as a " @@ -826,6 +826,7 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, ret = -EINVAL; goto fail; } + qdict_del(options, "filename"); } else if (!drv->bdrv_parse_filename && !filename) { qerror_report(ERROR_CLASS_GENERIC_ERROR, "The '%s' block driver requires a file name", @@ -839,11 +840,6 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, goto fail; } - /* TODO Remove once all protocols know the filename option */ - if (qdict_haskey(options, "filename")) { - qdict_del(options, "filename"); - } - /* Check if any unknown options were used */ if (qdict_size(options) != 0) { const QDictEntry *entry = qdict_first(options); diff --git a/block/blkdebug.c b/block/blkdebug.c index 3d03fcb63..71f99e406 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -346,8 +346,7 @@ static QemuOptsList runtime_opts = { }, }; -static int blkdebug_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags) { BDRVBlkdebugState *s = bs->opaque; QemuOpts *opts; diff --git a/block/blkverify.c b/block/blkverify.c index d63158f6d..1d58cc393 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -116,8 +116,7 @@ static QemuOptsList runtime_opts = { }, }; -static int blkverify_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int blkverify_open(BlockDriverState *bs, QDict *options, int flags) { BDRVBlkverifyState *s = bs->opaque; QemuOpts *opts; diff --git a/block/curl.c b/block/curl.c index 61bc3dbfb..b8935fd99 100644 --- a/block/curl.c +++ b/block/curl.c @@ -395,8 +395,7 @@ static QemuOptsList runtime_opts = { }, }; -static int curl_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int curl_open(BlockDriverState *bs, QDict *options, int flags) { BDRVCURLState *s = bs->opaque; CURLState *state = NULL; diff --git a/block/gluster.c b/block/gluster.c index 3796da8d6..91acde248 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -296,8 +296,8 @@ static QemuOptsList runtime_opts = { }, }; -static int qemu_gluster_open(BlockDriverState *bs, const char *dummy, - QDict *options, int bdrv_flags) +static int qemu_gluster_open(BlockDriverState *bs, QDict *options, + int bdrv_flags) { BDRVGlusterState *s = bs->opaque; int open_flags = O_BINARY; diff --git a/block/iscsi.c b/block/iscsi.c index 907beba4a..f7199c1ab 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1021,8 +1021,7 @@ static QemuOptsList runtime_opts = { * We support iscsi url's on the form * iscsi://[%@][:]// */ -static int iscsi_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int iscsi_open(BlockDriverState *bs, QDict *options, int flags) { IscsiLun *iscsilun = bs->opaque; struct iscsi_context *iscsi = NULL; @@ -1237,7 +1236,7 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options) bs_options = qdict_new(); qdict_put(bs_options, "filename", qstring_from_str(filename)); - ret = iscsi_open(&bs, NULL, bs_options, 0); + ret = iscsi_open(&bs, bs_options, 0); QDECREF(bs_options); if (ret != 0) { diff --git a/block/nbd.c b/block/nbd.c index eff683c8d..61b7c9b6f 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -441,8 +441,7 @@ static void nbd_teardown_connection(BlockDriverState *bs) closesocket(s->sock); } -static int nbd_open(BlockDriverState *bs, const char* filename, - QDict *options, int flags) +static int nbd_open(BlockDriverState *bs, QDict *options, int flags) { BDRVNBDState *s = bs->opaque; int result; diff --git a/block/raw-posix.c b/block/raw-posix.c index afd5385b4..c0ccf273a 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -335,8 +335,7 @@ fail: return ret; } -static int raw_open(BlockDriverState *bs, const char *filename, - QDict *options, int flags) +static int raw_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; @@ -1325,8 +1324,7 @@ static int check_hdev_writable(BDRVRawState *s) return 0; } -static int hdev_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int hdev_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; int ret; @@ -1565,8 +1563,7 @@ static BlockDriver bdrv_host_device = { }; #ifdef __linux__ -static int floppy_open(BlockDriverState *bs, const char *filename, - QDict *options, int flags) +static int floppy_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; int ret; @@ -1688,8 +1685,7 @@ static BlockDriver bdrv_host_floppy = { .bdrv_eject = floppy_eject, }; -static int cdrom_open(BlockDriverState *bs, const char *filename, - QDict *options, int flags) +static int cdrom_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; @@ -1797,8 +1793,7 @@ static BlockDriver bdrv_host_cdrom = { #endif /* __linux__ */ #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) -static int cdrom_open(BlockDriverState *bs, const char *filename, - QDict *options, int flags) +static int cdrom_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; int ret; diff --git a/block/raw-win32.c b/block/raw-win32.c index be33cc12f..7c03b6df5 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -234,8 +234,7 @@ static QemuOptsList raw_runtime_opts = { }, }; -static int raw_open(BlockDriverState *bs, const char *unused, - QDict *options, int flags) +static int raw_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; int access_flags; @@ -531,8 +530,7 @@ static int hdev_probe_device(const char *filename) return 0; } -static int hdev_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int hdev_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; int access_flags, create_flags; diff --git a/block/rbd.c b/block/rbd.c index 0d6814588..182641149 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -455,8 +455,7 @@ static QemuOptsList runtime_opts = { }, }; -static int qemu_rbd_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRBDState *s = bs->opaque; char pool[RBD_MAX_POOL_NAME_SIZE]; diff --git a/block/sheepdog.c b/block/sheepdog.c index e224c5134..20b5d06c5 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1140,8 +1140,7 @@ static QemuOptsList runtime_opts = { }, }; -static int sd_open(BlockDriverState *bs, const char *dummy, - QDict *options, int flags) +static int sd_open(BlockDriverState *bs, QDict *options, int flags) { int ret, fd; uint32_t vid = 0; diff --git a/block/ssh.c b/block/ssh.c index 93a8b53ff..246a70d27 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -608,8 +608,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, return ret; } -static int ssh_file_open(BlockDriverState *bs, const char *filename, - QDict *options, int bdrv_flags) +static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags) { BDRVSSHState *s = bs->opaque; int ret; diff --git a/block/vvfat.c b/block/vvfat.c index f4c06b9d5..87b02799d 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1065,8 +1065,7 @@ static void vvfat_parse_filename(const char *filename, QDict *options, qdict_put(options, "rw", qbool_from_int(rw)); } -static int vvfat_open(BlockDriverState *bs, const char* dummy, - QDict *options, int flags) +static int vvfat_open(BlockDriverState *bs, QDict *options, int flags) { BDRVVVFATState *s = bs->opaque; int cyls, heads, secs; diff --git a/include/block/block_int.h b/include/block/block_int.h index 458cde376..6078dd389 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -87,8 +87,7 @@ struct BlockDriver { void (*bdrv_reopen_abort)(BDRVReopenState *reopen_state); int (*bdrv_open)(BlockDriverState *bs, QDict *options, int flags); - int (*bdrv_file_open)(BlockDriverState *bs, const char *filename, - QDict *options, int flags); + int (*bdrv_file_open)(BlockDriverState *bs, QDict *options, int flags); int (*bdrv_read)(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors); int (*bdrv_write)(BlockDriverState *bs, int64_t sector_num, -- 2.39.2