Re: [Qemu-devel] [PATCH for-2.12] block/rbd: remove processed options from qdict

[Kevin Wolf]

Am 04.04.2018 um 17:53 hat Jeff Cody geschrieben:
> Commit 4bfb274 added some QAPIfication of option parsing in
> qemu_rbd_open().  We need to remove all the options we processed,
> otherwise in bdrv_open_inherit() we will think the remaining options are
> invalid.
> 
> (This needs to go in 2.12 to avoid a regression that prevents rbd
> from being opened.)
> 
> Suggested-by: Kevin Wolf 
> Signed-off-by: Jeff Cody 

Reviewed-by: Kevin Wolf 

[Qemu-devel] [PATCH for-2.12] block/rbd: remove processed options from qdict

[Jeff Cody]

Commit 4bfb274 added some QAPIfication of option parsing in
qemu_rbd_open().  We need to remove all the options we processed,
otherwise in bdrv_open_inherit() we will think the remaining options are
invalid.

(This needs to go in 2.12 to avoid a regression that prevents rbd
from being opened.)

Suggested-by: Kevin Wolf 
Signed-off-by: Jeff Cody 
---
 block/rbd.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/block/rbd.c b/block/rbd.c
index 5b64849dc6..c9359d0ad8 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -623,6 +623,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict 
*options, int flags,
 BlockdevOptionsRbd *opts = NULL;
 Visitor *v;
 QObject *crumpled = NULL;
+const QDictEntry *e;
 Error *local_err = NULL;
 const char *filename;
 char *keypairs, *secretid;
@@ -671,6 +672,12 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict 
*options, int flags,
 goto out;
 }
 
+/* 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);
+}
+
 r = qemu_rbd_connect(>cluster, >io_ctx, opts,
  !(flags & BDRV_O_NOCACHE), keypairs, secretid, errp);
 if (r < 0) {
-- 
2.13.6