diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-26 17:29:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-26 17:29:14 +0000 |
| commit | 6233b4a8c2a32ef6955a921246fa08705bbb3676 (patch) | |
| tree | d8985aba7aa14f1c066f8e75b1d479cf833edacd /net/colo.h | |
| parent | e607bbee553cfe73072870cef458cfa4e78133e2 (diff) | |
| parent | 9776f0db6a19a0510e89b7aae38190b4811c95ba (diff) | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-01-26' into staging
nbd patches for 2018-01-26
- Vladimir Sementsov-Ogievskiy - nbd export qmp interface
- Eric Blake - hmp: Add nbd_server_remove to mirror QMP command
- Edgar Kaziakhmedov - nbd: implement bdrv_get_info callback
# gpg: Signature made Fri 26 Jan 2018 16:02:34 GMT
# gpg: using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg: aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2018-01-26:
nbd: implement bdrv_get_info callback
hmp: Add nbd_server_remove to mirror QMP command
iotest 205: new test for qmp nbd-server-remove
iotests: implement QemuIoInteractive class
iotest 147: add cases to test new @name parameter of nbd-server-add
qapi: add nbd-server-remove
hmp: Add name parameter to nbd_server_add
qapi: add name parameter to nbd-server-add
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/colo.h')
0 files changed, 0 insertions, 0 deletions