v2: * Rebase onto Jeff's block tree to get mirror ratelimit fix [Jeff, Vladimir] * Update comments in 185 since drain no longer causes a spurious iteration
The 185 qemu-iotests test case was in a bad state for the QEMU 2.12 release. We fudged the expected test output to make it pass, except for non-deterministic behavior. These patches get us back to pre-QEMU 2.12. Notably the offsets reported in block job events now correspond to smaller buffer sizes because the job doesn't iterate during drain. It's worth mentioning that the test case is still non-deterministic. For more on that, see the first patch. Stefan Hajnoczi (2): qemu-iotests: reduce chance of races in 185 blockjob: do not cancel timer in resume blockjob.c | 22 +++++++++++++++------- tests/qemu-iotests/185 | 17 +++++++++++++---- tests/qemu-iotests/185.out | 12 +++++------- 3 files changed, 33 insertions(+), 18 deletions(-) -- 2.14.3