Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Wed 13 Apr 2016 00:32:22 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
* remotes/jnsnow/tags/ide-pull-request:
ide: really restart pending and in-flight atapi dma
ide: restart atapi dma by re-evaluating command packet
ide: don't lose pending dma state
xen: Fix IDE unplug
Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- hw/ide/atapi.c 12 additions, 14 deletionshw/ide/atapi.c
- hw/ide/core.c 16 additions, 23 deletionshw/ide/core.c
- hw/ide/internal.h 35 additions, 0 deletionshw/ide/internal.h
- hw/ide/macio.c 2 additions, 0 deletionshw/ide/macio.c
- hw/ide/pci.c 4 additions, 0 deletionshw/ide/pci.c
- hw/ide/piix.c 1 addition, 0 deletionshw/ide/piix.c
Loading
Please register or sign in to comment