yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-rbd-Drop-deprecated-drive-parameter-filename.patch

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