在 2018/4/4 23:01, Stefan Hajnoczi 写道: > Commit 4486e89c219c0d1b9bd8dfa0b1dd5b0d51ff2268 ("vl: introduce > vm_shutdown()") added a bdrv_drain_all() call. As a side-effect of the > drain operation the block job iterates one more time than before. The > 185 output no longer matches and the test is failing now. > > It may be possible to avoid the superfluous block job iteration, but > that type of patch is not suitable late in the QEMU 2.12 release cycle. > > This patch simply updates the 185 output file. The new behavior is > correct, just not optimal, so make the test pass again. > > Fixes: 4486e89c219c0d1b9bd8dfa0b1dd5b0d51ff2268 ("vl: introduce > vm_shutdown()") > Cc: Kevin Wolf <kw...@redhat.com> > Cc: QingFeng Hao <ha...@linux.vnet.ibm.com> > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> > --- > tests/qemu-iotests/185 | 10 ++++++---- > tests/qemu-iotests/185.out | 12 +++++++----- > 2 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 > index f5b47e4c1a..298d88d04e 100755 > --- a/tests/qemu-iotests/185 > +++ b/tests/qemu-iotests/185 > @@ -92,9 +92,8 @@ echo === Start commit job and exit qemu === > echo > > # Note that the reference output intentionally includes the 'offset' field in > -# BLOCK_JOB_CANCELLED events for all of the following block jobs. They are > -# predictable and any change in the offsets would hint at a bug in the job > -# throttling code. > +# BLOCK_JOB_* events for all of the following block jobs. They are > predictable > +# and any change in the offsets would hint at a bug in the job throttling > code. > # > # In order to achieve these predictable offsets, all of the following tests > # use speed=65536. Each job will perform exactly one iteration before it has > @@ -102,11 +101,14 @@ echo > # command to be received (after receiving the command, the rest runs > # synchronously, so jobs can arbitrarily continue or complete). > # > +# Jobs present while QEMU is terminating iterate once more due to > +# bdrv_drain_all(). > +# > # The buffer size for commit and streaming is 512k (waiting for 8 seconds > after > # the first request), for active commit and mirror it's large enough to cover > # the full 4M, and for backup it's the qcow2 cluster size, which we know is > # 64k. As all of these are at least as large as the speed, we are sure that > the > -# offset doesn't advance after the first iteration before qemu exits. > +# offset advances exactly twice before qemu exits. > > _send_qemu_cmd $h \ > "{ 'execute': 'block-commit', Reviewed-by: QingFeng Hao <ha...@linux.vnet.ibm.com>
> diff --git a/tests/qemu-iotests/185.out b/tests/qemu-iotests/185.out > index 57eaf8d699..2c4b04de73 100644 [...] > -- Regards QingFeng Hao