Re: [PATCH v2 21/31] block/export: Add BLOCK_EXPORT_DELETED event

[Max Reitz <mreitz@redhat.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1746 bytes --]

On 24.09.20 17:27, Kevin Wolf wrote:
> Clients may want to know when an export has finally disappeard
> (block-export-del returns earlier than that in the general case), so add
> a QAPI event for it.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  qapi/block-export.json     | 12 ++++++++++++
>  block/export/export.c      |  2 ++
>  tests/qemu-iotests/140     |  9 ++++++++-
>  tests/qemu-iotests/140.out |  2 +-
>  tests/qemu-iotests/223.out |  4 ++++
>  5 files changed, 27 insertions(+), 2 deletions(-)

[...]

> diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
> index 8d2ce5d9e3..309b177e77 100755
> --- a/tests/qemu-iotests/140
> +++ b/tests/qemu-iotests/140
> @@ -81,10 +81,17 @@ $QEMU_IO_PROG -f raw -r -c 'read -P 42 0 64k' \
>      "nbd+unix:///drv?socket=$SOCK_DIR/nbd" 2>&1 \
>      | _filter_qemu_io | _filter_nbd
>  
> +# The order of 'return' and the BLOCK_EXPORT_DELETED event is undefined. Just
> +# wait until we've twice seen one of them. Filter the 'return' line out so that
> +# the output is defined.
>  _send_qemu_cmd $QEMU_HANDLE \
>      "{ 'execute': 'eject',
>         'arguments': { 'device': 'drv' }}" \
> -    'return'
> +    'return\|BLOCK_EXPORT_DELETED' |
> +    grep -v 'return'
> +
> +_send_qemu_cmd $QEMU_HANDLE '' 'return\|BLOCK_EXPORT_DELETED' |
> +    grep -v 'return'

Funny.  I did basically the same thing (only I filtered the event, not
the return):

https://git.xanclic.moe/XanClic/qemu/commit/e6f7510149a4a26c868013639ec89d28f16857d8#diff-3

and considered it kind of a hack.

Oh well. :)

Reviewed-by: Max Reitz <mreitz@redhat.com>

>  $QEMU_IO_PROG -f raw -r -c close \
>      "nbd+unix:///drv?socket=$SOCK_DIR/nbd" 2>&1 \


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]