|
 |
1bdc94 |
From 61a2510cbf901b95759402df893e63be02b510d1 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
1bdc94 |
Date: Mon, 18 Jun 2018 08:43:13 +0200
|
|
|
1bdc94 |
Subject: [PATCH 06/54] rbd: Drop deprecated -drive parameter "filename"
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180618084330.30009-7-armbru@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 80735
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 06/23] rbd: Drop deprecated -drive parameter "filename"
|
|
|
1bdc94 |
Bugzilla: 1557995
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Parameter "filename" is deprecated since commit 91589d9e5ca, v2.10.0.
|
|
|
1bdc94 |
Time to get rid of it.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit bb9f762ff35459e34630d731a5a91c02602150d1)
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
block/rbd.c | 16 ----------------
|
|
|
1bdc94 |
1 file changed, 16 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/block/rbd.c b/block/rbd.c
|
|
|
1bdc94 |
index a14b42f..2842c0e 100644
|
|
|
1bdc94 |
--- a/block/rbd.c
|
|
|
1bdc94 |
+++ b/block/rbd.c
|
|
|
1bdc94 |
@@ -625,25 +625,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
1bdc94 |
QObject *crumpled = NULL;
|
|
|
1bdc94 |
const QDictEntry *e;
|
|
|
1bdc94 |
Error *local_err = NULL;
|
|
|
1bdc94 |
- const char *filename;
|
|
|
1bdc94 |
char *keypairs, *secretid;
|
|
|
1bdc94 |
int r;
|
|
|
1bdc94 |
|
|
|
1bdc94 |
- /* If we are given a filename, parse the filename, with precedence given to
|
|
|
1bdc94 |
- * filename encoded options */
|
|
|
1bdc94 |
- filename = qdict_get_try_str(options, "filename");
|
|
|
1bdc94 |
- if (filename) {
|
|
|
1bdc94 |
- warn_report("'filename' option specified. "
|
|
|
1bdc94 |
- "This is an unsupported option, and may be deprecated "
|
|
|
1bdc94 |
- "in the future");
|
|
|
1bdc94 |
- qemu_rbd_parse_filename(filename, options, &local_err);
|
|
|
1bdc94 |
- qdict_del(options, "filename");
|
|
|
1bdc94 |
- if (local_err) {
|
|
|
1bdc94 |
- error_propagate(errp, local_err);
|
|
|
1bdc94 |
- return -EINVAL;
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
|
|
|
1bdc94 |
if (keypairs) {
|
|
|
1bdc94 |
qdict_del(options, "=keyvalue-pairs");
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|