Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
commita53efe9c47c9a441b307c5cec64d08d9647ab6a4
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Sep 2015 15:57:59 +0000 (18 16:57 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Sep 2015 15:57:59 +0000 (18 16:57 +0100)
treec69c3b028a2854fbe4186f1af1556428791111a0
parentffa4822c015d5670ef6a2239f3cbd2ff2cec57de
parente47f9eb148fc3b9a67d318951ebceb834205f94c
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

# gpg: Signature made Fri 18 Sep 2015 15:59:02 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  ahci: clean up initial d2h semantics
  ahci: remove cmd_fis argument from write_fis_d2h
  ahci: fix signature generation
  ahci: remove dead reset code
  atapi: abort transfers with 0 byte limits
  ide: fix ATAPI command permissions
  ide-test: add cdrom dma test
  ide-test: add cdrom pio test
  qtest/ahci: export generate_pattern
  qtest/ahci: use generate_pattern everywhere
  ide: unify io_buffer_offset increments

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