Skip to content

Commit bb9f762

Browse files
Markus Armbrusterkevmw
Markus Armbruster
authored andcommitted
rbd: Drop deprecated -drive parameter "filename"
Parameter "filename" is deprecated since commit 91589d9, v2.10.0. Time to get rid of it. Signed-off-by: Markus Armbruster <[email protected]> Reviewed-by: Kevin Wolf <[email protected]> Signed-off-by: Kevin Wolf <[email protected]>
1 parent b8a366f commit bb9f762

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

block/rbd.c

-16
Original file line numberDiff line numberDiff line change
@@ -632,25 +632,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
632632
QObject *crumpled = NULL;
633633
const QDictEntry *e;
634634
Error *local_err = NULL;
635-
const char *filename;
636635
char *keypairs, *secretid;
637636
int r;
638637

639-
/* If we are given a filename, parse the filename, with precedence given to
640-
* filename encoded options */
641-
filename = qdict_get_try_str(options, "filename");
642-
if (filename) {
643-
warn_report("'filename' option specified. "
644-
"This is an unsupported option, and may be deprecated "
645-
"in the future");
646-
qemu_rbd_parse_filename(filename, options, &local_err);
647-
qdict_del(options, "filename");
648-
if (local_err) {
649-
error_propagate(errp, local_err);
650-
return -EINVAL;
651-
}
652-
}
653-
654638
keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
655639
if (keypairs) {
656640
qdict_del(options, "=keyvalue-pairs");

0 commit comments

Comments
 (0)