d665afae2a
A couple of fixes, including one which gives confidence we can submit to Factory finally. OBS-URL: https://build.opensuse.org/request/show/612290 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=410
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 07cfae0f6649239efdbf4aa97db175468495c5a1 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Wed, 16 May 2018 18:08:16 +0200
|
|
Subject: [PATCH] nfs: Remove processed options from QDict
|
|
|
|
Commit c22a03454 QAPIfied option parsing in the NFS block driver, but
|
|
forgot to remove all the options we processed. Therefore, we get an
|
|
error in bdrv_open_inherit(), which thinks the remaining options are
|
|
invalid. Trying to open an NFS image will result in an error like this:
|
|
|
|
Block protocol 'nfs' doesn't support the option 'server.host'
|
|
|
|
Remove all options from the QDict to make the NFS driver work again.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Message-id: 20180516160816.26259-1-kwolf@redhat.com
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
(cherry picked from commit c82be42cc803b36fd7aed5dceec68312c7056fd5)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
block/nfs.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/block/nfs.c b/block/nfs.c
|
|
index 2577df4b26..dc12d5000d 100644
|
|
--- a/block/nfs.c
|
|
+++ b/block/nfs.c
|
|
@@ -557,6 +557,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
|
|
BlockdevOptionsNfs *opts = NULL;
|
|
QObject *crumpled = NULL;
|
|
Visitor *v;
|
|
+ const QDictEntry *e;
|
|
Error *local_err = NULL;
|
|
|
|
crumpled = qdict_crumple(options, errp);
|
|
@@ -573,6 +574,12 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
|
|
return NULL;
|
|
}
|
|
|
|
+ /* Remove the processed options from the QDict (the visitor processes
|
|
+ * _all_ options in the QDict) */
|
|
+ while ((e = qdict_first(options))) {
|
|
+ qdict_del(options, e->key);
|
|
+ }
|
|
+
|
|
return opts;
|
|
}
|
|
|