david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: Drop deprecated -drive parameter "filename"

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

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2018-06-14 21:14:26 +02:00 committed by Kevin Wolf
parent b8a366feb2
commit bb9f762ff3
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/rbd.c
View File

@ -632,25 +632,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
QObject *crumpled = NULL; QObject *crumpled = NULL;
const QDictEntry *e; const QDictEntry *e;
Error *local_err = NULL; Error *local_err = NULL;
const char *filename;
char *keypairs, *secretid; char *keypairs, *secretid;
int r; 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")); keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
if (keypairs) { if (keypairs) {
qdict_del(options, "=keyvalue-pairs"); qdict_del(options, "=keyvalue-pairs");