tree b2191ee983aa072c38c319554cfb3474a3d20df3
parent 7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6
parent c5620e658e4061ac1bd51377966590d5aca2ad05
author Peter Maydell <peter.maydell@linaro.org> 1452595088 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1452595088 +0000
mergetag object c5620e658e4061ac1bd51377966590d5aca2ad05
 type commit
 tag ide-pull-request
 tagger John Snow <jsnow@redhat.com> 1452539787 -0500
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWk/+LAAoJEH3vgQaq/DkOkxwP/ivsjXs69noYV+xpAiah5OwR
 MrfudT/4xFg2cSAbFDvAXbkk+6ibcxpd46zYX6X3aS56469vU0kOh5xueQtZeMOl
 0XTZNN2LifbD+aa7DcnmHPqppe1cF0wJCzhZzc0cSv+LxASqyi9iQKt2ewscXdXO
 fkOoJxLA6620jYRrMet7linKWxAoM/Gp0gz0/jspOluzNrW1XbE2lrf8JPkUsKQB
 8rgEJ9dUtye7duW790twGPTql/vrmRu/ZtVLjVvjwyhqPrIQnE+QhQ9qCQg9QBiW
 wNctK27X9Hck4XEH90TS5/M6van8h+OT9ouG2BAr7Uo8iacoSHmxV2w/IT+BglXL
 0XFbAp377hEUKe3DzneKB7aLMOmPGnyKlr4/ZWJeYGyyaBadafsDvn0ALHM6ymUe
 qRtDhcQ7rjzkFU/AcNhdpT4wIO9hhUXSrZqb6KNYvipdtk1ul6RSOoiMS7Vz5nMI
 Kjeg7rbHBzKHmf1/rQGfT7YlMgQSo4kzSII6NDc6/HsrAYx4Zm7AL35nJN0LcC9h
 l11LEtyEp80X1hI9h25OHch50CfojWXNE29Rq9EuG7poa4mTGQDAIhmGiF5EZLF8
 wkI0euoL0UwaAWbgNhaEECjMq6FSkH9I3xHmf2QuYaaa7oxnAYCcc0bh/eJQ7ARf
 hpkGcjG7/l1uT1MZ8dZb
 =5saf
 -----END PGP SIGNATURE-----

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

# gpg: Signature made Mon 11 Jan 2016 19:16:27 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  libqos/ahci: organize header
  qtest/ahci: ATAPI data tests
  libqos/ahci: add ahci_exec
  libqos/ahci: allow nondata commands for ahci_io variants
  libqos: allow zero-size allocations
  libqos/ahci: Switch to mutable properties
  libqos/ahci: ATAPI identify
  libqos/ahci: ATAPI support
  ahci-test: fix memory leak
  ide: ahci: reset ncq object to unused on error
  macio: fix overflow in lba to offset conversion for ATAPI devices

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