From: Peter Maydell Date: Thu, 2 Mar 2017 23:20:37 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging X-Git-Tag: v2.9.0-rc0~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54639aed97bc1faa2f3a5dc4ea69fd7b527fe573;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging # gpg: Signature made Thu 02 Mar 2017 03:42:59 GMT # gpg: using RSA key 0xBDBE7B27C0DE3057 # gpg: Good signature from "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057 * remotes/cody/tags/block-pull-request: block/rbd: add support for 'mon_host', 'auth_supported' via QAPI block/rbd: add blockdev-add support block/rbd: parse all options via bdrv_parse_filename block/rbd: add all the currently supported runtime_opts block/rbd: don't copy strings in qemu_rbd_next_tok() Signed-off-by: Peter Maydell --- 54639aed97bc1faa2f3a5dc4ea69fd7b527fe573