summary refs log tree commit diff stats
path: root/migration/qemu-file-unix.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-11-26 09:44:25 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-11-26 09:44:25 +0000
commit7ef7ddf37674f7147ef23c311cbc3c37e908c8b0 (patch)
treed315663ef19621cccfa09e00a136f6bdd66f48f7 /migration/qemu-file-unix.c
parentc7933a80bc6f3bb79c341f8fc17b4cf76622e2f3 (diff)
parent9c73517ca56d6611371376bd298b4b20f3ad6140 (diff)
downloadfocaccia-qemu-7ef7ddf37674f7147ef23c311cbc3c37e908c8b0.tar.gz
focaccia-qemu-7ef7ddf37674f7147ef23c311cbc3c37e908c8b0.zip
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>
Diffstat (limited to 'migration/qemu-file-unix.c')
0 files changed, 0 insertions, 0 deletions