ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

iQIcBAABAgAGBQJaxPhdAAoJEL2+eyfA3jBXpWIP+wcpccO47D1TBHN+n6eR3RSX
 IVCzoHBSD/ii1HCLLH9YFHFb4N/HGzFX51Dqqvv/Y7ZJpp8ybbblFVLwM07f5mwM
 evf/1utvzhgTlrzMZ7VcByU869c+EbYR/r7pfEzAK7aCZXTj2Gvf2GxdZPrEjrWz
 dESYx8EzQOkVDbyOONrTweZgbDltJZO7Xmwu8tWKtdn3mw0OTBEj+m32+IFmprlE
 ZKGgswflQAdVeUSjXEVwgP5qeV3+rMSgDYTRka0TszAu6fy1QNpPSNrY+5E4lidK
 nAmzUzNpvr4GYwbX2RCPEwcC0Mk5ot9JFOmRnnER0UrpOA9VTv6+niG54q7bNyIx
 2bLtGhAY2PiV/EEjNrIT02/HUwO0wiMUBdhObmQj/XqLDmq2DhWHU2Z5NHHAMB0Y
 mTE7jpaKrZKv1Ui8LFG4mMWvoskJY5kcuHCJ2P29ktDIkctmirNa3NfdSqKSYaZh
 VOwkU4VsX41issBHW0ya96rL11A9qZAxiSUU81fQuEWJB55X3hq/q0Ze99/otVTN
 fAsDpMEG4A7sHBlVUQVRfTZH0ofgnkpQ5nHMMax0zY0/bDRqGRVTARHDFBSDqgLi
 xNB2YpNaVYqM8uyL8PMLHTPF79LgH74Ohe44rpwSUtxVvXRyW459dPsDC0VgLJrk
 tMOyBA8tHsY4XZuIZ8Y0
 =SxAD
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Wed 04 Apr 2018 17:07:57 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  block/rbd: remove processed options from qdict

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-04-04 17:48:18 +01:00
parent 74912f6dad bfb15b4bec
commit f1a639aaf2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block/rbd.c
View File

@ -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(&s->cluster, &s->io_ctx, opts,
!(flags & BDRV_O_NOCACHE), keypairs, secretid, errp);
if (r < 0) {