On 04/04/2018 10:01 AM, Stefan Hajnoczi wrote:
> 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 <[email protected]>
> Cc: QingFeng Hao <[email protected]>
> Signed-off-by: Stefan Hajnoczi <[email protected]>
> ---
> tests/qemu-iotests/185 | 10 ++++++----
> tests/qemu-iotests/185.out | 12 +++++++-----
> 2 files changed, 13 insertions(+), 9 deletions(-)> @@ -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(). Do we want to add something like: "FIXME: removing the bdrv_drain_all() may be desirable in a future patch; and would warrant a change to the expected output."? Either way, Reviewed-by: Eric Blake <[email protected]> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
