From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 26 Nov 2015 09:44:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
X-Git-Tag: v2.7.1~729
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7ef7ddf37674f7147ef23c311cbc3c37e908c8b0;p=mirror_qemu.git

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

# gpg: Signature made Wed 25 Nov 2015 20:25:21 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  ide-test: fix timeouts
  atapi: Fix code indentation
  atapi: Account for failed and invalid operations in cd_read_sector()
  ide-test: cdrom_pio_impl fixup

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

7ef7ddf37674f7147ef23c311cbc3c37e908c8b0