Commit 56d1b4d2 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Remove filename parameter from .bdrv_file_open() 



It is unused now in all block drivers.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 7ad9be64

block.c

+2 −6
Original line number Diff line number Diff line
@@ -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);

block/blkdebug.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

block/blkverify.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

block/curl.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

block/gluster.c

+2 −2
Original line number Diff line number Diff line
@@ -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;