[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v2 1/1] qemu-iotests: 067: ignore QMP events
From: |
Max Reitz |
Subject: |
Re: [Qemu-block] [PATCH v2 1/1] qemu-iotests: 067: ignore QMP events |
Date: |
Sat, 20 Feb 2016 15:39:25 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 |
On 19.02.2016 14:01, Sascha Silbe wrote:
> The relative ordering of "device_del" return value and the
> "DEVICE_DELETED" QMP event depends on the architecture being
> tested. On x86 unplugging virtio disks is asynchronous
> (=qdev_unplug()= → =hotplug_handler_unplug_request()=) while on s390x
> it is synchronous (=qdev_unplug()= → =hotplug_handler_unplug()=). This
> leads to the actual output on s390x consistently differing from the
> reference output (that was probably produced on x86).
>
> The easiest way to address this is to filter out QMP events in
> 067. The DEVICE_DELETED event is already getting explicitly tested by
> the Python-based test case 139, so the test coverage should be
> unaffected. Make use of the recently introduced _filter_qmp_events()
> to remove QMP events from the test case output and adjust the
> reference output accordingly.
>
> The tr / sed / tr trick used for filtering was suggested by Max Reitz
> <address@hidden>.
>
> Signed-off-by: Sascha Silbe <address@hidden>
> ---
> v1->v2:
> - squashed the two patches
> - using tr + sed incantation so we can keep the pretty-printing, but
> moved the filter into 067 as it's not general enough for
> common.filter
> ---
> tests/qemu-iotests/067 | 11 +++-
> tests/qemu-iotests/067.out | 144
> ---------------------------------------------
> 2 files changed, 10 insertions(+), 145 deletions(-)
Thanks, applied to my block tree:
https://github.com/XanClic/qemu/commits/block
Max
signature.asc
Description: OpenPGP digital signature