Commit bb9f762f authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

rbd: Drop deprecated -drive parameter "filename" 



Parameter "filename" is deprecated since commit 91589d9e, v2.10.0.
Time to get rid of it.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent b8a366fe

block/rbd.c

+0 −16
Original line number Diff line number Diff line
@@ -632,25 +632,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, 
    QObject *crumpled = NULL;

    const QDictEntry *e;

    Error *local_err = NULL;

    const char *filename;

    char *keypairs, *secretid;

    int r;



    /* If we are given a filename, parse the filename, with precedence given to

     * filename encoded options */

    filename = qdict_get_try_str(options, "filename");

    if (filename) {

        warn_report("'filename' option specified. "

                    "This is an unsupported option, and may be deprecated "

                    "in the future");

        qemu_rbd_parse_filename(filename, options, &local_err);

        qdict_del(options, "filename");

        if (local_err) {

            error_propagate(errp, local_err);

            return -EINVAL;

        }

    }



    keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));

    if (keypairs) {

        qdict_del(options, "=keyvalue-pairs");