[Qemu-commits] [qemu/qemu] bfb15b: block/rbd: remove processed options from qdict

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bfb15b4becf2c9cf484bc3bf893a37c8f3c15cb3
      
https://github.com/qemu/qemu/commit/bfb15b4becf2c9cf484bc3bf893a37c8f3c15cb3
  Author: Jeff Cody <address@hidden>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  block/rbd: remove processed options from qdict

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 <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>


  Commit: f1a639aaf2748ad3f804c4d862f570ec6473da79
      
https://github.com/qemu/qemu/commit/f1a639aaf2748ad3f804c4d862f570ec6473da79
  Author: Peter Maydell <address@hidden>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/74912f6dad20...f1a639aaf274