diff mbox

[for-2.5] iotests: drop thread spun work-around

Message ID 1448883236-23585-1-git-send-email-mst@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin Oct. 10, 2016, 2:57 a.m. UTC
We've disabled the warning, there should be no need for test to work
around it.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

This is on top of
    main-loop: suppress warnings under qtest

I just tested this by running make check.
Is this enough?

 tests/qemu-iotests/common.filter | 1 -
 1 file changed, 1 deletion(-)

Comments

Max Reitz Oct. 10, 2016, 6:23 p.m. UTC | #1
On 10.10.2016 04:57, Michael S. Tsirkin wrote:
> We've disabled the warning, no need for test to work
> around it.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  tests/qemu-iotests/common.filter | 1 -
>  1 file changed, 1 deletion(-)

Thanks, I've applied the patch to my block branch:

https://github.com/XanClic/qemu/commits/block

Max
Max Reitz Oct. 10, 2016, 7:07 p.m. UTC | #2
On 10.10.2016 04:57, Michael S. Tsirkin wrote:
> We've disabled the warning, there should be no need for test to work
> around it.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> 
> This is on top of
>     main-loop: suppress warnings under qtest
> 
> I just tested this by running make check.
> Is this enough?

It should be, but I'm not sure why you want this patch for 2.5. Anyway:

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

>  tests/qemu-iotests/common.filter | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
> index cfdb633..49217b0 100644
> --- a/tests/qemu-iotests/common.filter
> +++ b/tests/qemu-iotests/common.filter
> @@ -164,7 +164,6 @@ _filter_qemu()
>  {
>      sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \
>          -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' \
> -        -e '/main-loop: WARNING: I\/O thread spun for [0-9]\+ iterations/d' \
>          -e $'s#\r##' # QEMU monitor uses \r\n line endings
>  }
>  
>
Max Reitz Oct. 17, 2016, 6:11 p.m. UTC | #3
On 10.10.2016 04:57, Michael S. Tsirkin wrote:
> We've disabled the warning, no need for test to work
> around it.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  tests/qemu-iotests/common.filter | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
> index cfdb633..49217b0 100644
> --- a/tests/qemu-iotests/common.filter
> +++ b/tests/qemu-iotests/common.filter
> @@ -164,7 +164,6 @@ _filter_qemu()
>  {
>      sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \
>          -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' \
> -        -e '/main-loop: WARNING: I\/O thread spun for [0-9]\+ iterations/d' \
>          -e $'s#\r##' # QEMU monitor uses \r\n line endings
>  }

I'll have to drop this patch from my queue for now because I noticed the
warnings reappearing. This is because the iotests only use
-machine accel=qtest, but don't create any -qtest character device.

Commit 21a24302e85024dd7b2a151158adbc1f5dc5c4dd changed the behavior so
that the warning will only be emitted if there is a -qtest character
device, reasoning that there are tests that do not use the qtest
accelerator but just the character device. However, this has the
downside of actually printing the warning if qemu is run only under the
qtest accelerator, without a -qtest chardev.

I've sent a patch to remedy this, but until that is merged, I'll have to
hold this patch.

(Also, some iotests do not yet use -machine accel=qtest at all, I'll
have to fix that first, too.)

Max
diff mbox

Patch

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index cfdb633..49217b0 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -164,7 +164,6 @@  _filter_qemu()
 {
     sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \
         -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' \
-        -e '/main-loop: WARNING: I\/O thread spun for [0-9]\+ iterations/d' \
         -e $'s#\r##' # QEMU monitor uses \r\n line endings
 }