| commit | 95766c2cd04395e5712b4d5967b3251f35d537df | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 10 Aug 2017 17:53:39 +0000 (10 18:53 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 10 Aug 2017 17:53:39 +0000 (10 18:53 +0100) | ||
| tree | 3a57304ab5961497cfec4ac3c00d818e4053f3f4 | treesnapshot (tar.gz zip) |
| parent | 473a321122fd3c2c327a5a5d01a9a41f26f1734c | commitdiff |
| parent | 17d0bc01bfcce0ad4fb5105d4502595224569ff0 | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu 10 Aug 2017 18:48:13 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: handle blk_getlength() errors
IDE: test flush on empty CDROM
IDE: Do not flush empty CDROM drives
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Thu 10 Aug 2017 18:48:13 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: handle blk_getlength() errors
IDE: test flush on empty CDROM
IDE: Do not flush empty CDROM drives
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>