|
 |
26ba25 |
From b600b0cb2f849e3f7761a9470b1ce05a1ca2548f Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Tue, 26 Jun 2018 09:47:48 +0200
|
|
|
26ba25 |
Subject: [PATCH 080/268] nfs: Remove processed options from QDict
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20180626094856.6924-6-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81058
|
|
|
26ba25 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 05/73] nfs: Remove processed options from QDict
|
|
|
26ba25 |
Bugzilla: 1513543
|
|
|
26ba25 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
Commit c22a03454 QAPIfied option parsing in the NFS block driver, but
|
|
|
26ba25 |
forgot to remove all the options we processed. Therefore, we get an
|
|
|
26ba25 |
error in bdrv_open_inherit(), which thinks the remaining options are
|
|
|
26ba25 |
invalid. Trying to open an NFS image will result in an error like this:
|
|
|
26ba25 |
|
|
|
26ba25 |
Block protocol 'nfs' doesn't support the option 'server.host'
|
|
|
26ba25 |
|
|
|
26ba25 |
Remove all options from the QDict to make the NFS driver work again.
|
|
|
26ba25 |
|
|
|
26ba25 |
Cc: qemu-stable@nongnu.org
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: 20180516160816.26259-1-kwolf@redhat.com
|
|
|
26ba25 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit c82be42cc803b36fd7aed5dceec68312c7056fd5)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
block/nfs.c | 7 +++++++
|
|
|
26ba25 |
1 file changed, 7 insertions(+)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/block/nfs.c b/block/nfs.c
|
|
|
26ba25 |
index 3059ef2..743ca04 100644
|
|
|
26ba25 |
--- a/block/nfs.c
|
|
|
26ba25 |
+++ b/block/nfs.c
|
|
|
26ba25 |
@@ -557,6 +557,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
|
|
|
26ba25 |
{
|
|
|
26ba25 |
BlockdevOptionsNfs *opts = NULL;
|
|
|
26ba25 |
Visitor *v;
|
|
|
26ba25 |
+ const QDictEntry *e;
|
|
|
26ba25 |
Error *local_err = NULL;
|
|
|
26ba25 |
|
|
|
26ba25 |
v = qobject_input_visitor_new_flat_confused(options, errp);
|
|
|
26ba25 |
@@ -572,6 +573,12 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
|
|
|
26ba25 |
return NULL;
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
+ /* Remove the processed options from the QDict (the visitor processes
|
|
|
26ba25 |
+ * _all_ options in the QDict) */
|
|
|
26ba25 |
+ while ((e = qdict_first(options))) {
|
|
|
26ba25 |
+ qdict_del(options, e->key);
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+
|
|
|
26ba25 |
return opts;
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|