diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 18:29:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 18:29:35 +0100 |
| commit | 20df6c7689eb89ab48fa5d5766d5c724c818148e (patch) | |
| tree | 96809d7b336768787a8f39527ed50add73c387dc /hw/core/machine.c | |
| parent | ff3351d4495c07501aa75e46aec3f494f51d29e1 (diff) | |
| parent | 5f66d060dbc37214c9d70305710c3e34c4531d7c (diff) | |
| download | focaccia-qemu-20df6c7689eb89ab48fa5d5766d5c724c818148e.tar.gz focaccia-qemu-20df6c7689eb89ab48fa5d5766d5c724c818148e.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-17' into staging
nbd patches for 2017-07-17 - Eric Blake: nbd: Fix iotests failure due to changed client error message - Eric Blake: [0/2] NBD fixes before softfreeze # gpg: Signature made Mon 17 Jul 2017 23:12:20 BST # 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-2017-07-17: nbd: Fix server reply to NBD_OPT_EXPORT_NAME of older clients nbd: Trace client command being sent nbd: Fix iotests failure due to changed client error message Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
0 files changed, 0 insertions, 0 deletions