diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-02 23:20:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-02 23:20:37 +0000 |
| commit | 54639aed97bc1faa2f3a5dc4ea69fd7b527fe573 (patch) | |
| tree | 316f0eef60ed8aa18dd4235e004267d994248a9a /hw/i386/acpi-build.c | |
| parent | ecb24d334af1a98ef0329f4b3b0e14ae8cb8770d (diff) | |
| parent | 0a55679b4a5061f4d74bdb1a0e81611ba3390b00 (diff) | |
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 <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: 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 <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/acpi-build.c')
0 files changed, 0 insertions, 0 deletions