The following changes since commit d44122ecd0fa62d20762bdd8f214f077cb8e011b:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-04-12 17:47:15 +0100) are available in the git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to 502356eeeb5fd2bdd92b2d5156e511626c1c3814: ide: really restart pending and in-flight atapi dma (2016-04-12 18:48:15 -0400) ---------------------------------------------------------------- ---------------------------------------------------------------- Anthony PERARD (1): xen: Fix IDE unplug Pavel Butsykin (3): ide: don't lose pending dma state ide: restart atapi dma by re-evaluating command packet ide: really restart pending and in-flight atapi dma hw/ide/atapi.c | 26 ++++++++++++-------------- hw/ide/core.c | 39 ++++++++++++++++----------------------- hw/ide/internal.h | 35 +++++++++++++++++++++++++++++++++++ hw/ide/macio.c | 2 ++ hw/ide/pci.c | 4 ++++ hw/ide/piix.c | 1 + 6 files changed, 70 insertions(+), 37 deletions(-) -- 2.4.11