diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-16 09:32:40 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-16 09:32:40 +0100 |
| commit | 66940d749197270c310c576af9e6f77478d1ee8f (patch) | |
| tree | 81a6670667b7e38287612ba630892dc150bd8e94 /hw/virtio/vhost-user.c | |
| parent | f3b9e787aee6ef7d216b616675db0f1c124da5e4 (diff) | |
| parent | 7d3e693646ad07459e04898663b37000858b4c20 (diff) | |
| download | qemu-66940d749197270c310c576af9e6f77478d1ee8f.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.7.0-rc3
# gpg: Signature made Mon 15 Aug 2016 14:55:46 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
iotests: Test case for wrong runtime option types
block/nbd: Store runtime option values
block/blkdebug: Store config filename
block/nbd: Use QemuOpts for runtime options
block/ssh: Use QemuOpts for runtime options
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/virtio/vhost-user.c')
0 files changed, 0 insertions, 0 deletions