ide: set retry_unit for PIO and FLUSH requests
commit35f78ab469b1d4ea4ff7ad4ffa997ae9ad3d4120
authorEvgeny Yakovlev <eyakovlev@virtuozzo.com>
Mon, 18 Jul 2016 19:39:50 +0000 (18 22:39 +0300)
committerJohn Snow <jsnow@redhat.com>
Mon, 18 Jul 2016 22:19:01 +0000 (18 18:19 -0400)
treedf93718f2320bab0670be1e6e4c1672ce32ff4af
parent0eeee07e24b46a31c4a07f1ba27a33a077f5e38b
ide: set retry_unit for PIO and FLUSH requests

The following sequence of tests discovered a problem in IDE emulation:
1. Send DMA write to IDE device 0
2. Send CMD_FLUSH_CACHE to same IDE device which will be failed by block
layer using blkdebug script in tests/ide-test:test_retry_flush

When doing DMA request ide/core.c will set s->retry_unit to s->unit in
ide_start_dma. When dma completes ide_set_inactive sets retry_unit to -1.
After that ide_flush_cache runs and fails thanks to blkdebug.
ide_flush_cb calls ide_handle_rw_error which asserts that s->retry_unit
== s->unit. But s->retry_unit is still -1 after previous DMA completion
and flush does not use anything related to retry.

This patch restricts retry unit assertion only to ops that actually use
retry logic.

Signed-off-by: Evgeny Yakovlev <eyakovlev@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1468870792-7411-3-git-send-email-den@openvz.org
CC: Kevin Wolf <kwolf@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Fam Zheng <famz@redhat.com>
CC: John Snow <jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
hw/ide/core.c