[Qemu-devel] [PATCH] block/mirror: Always call block_job_sleep_ns()

[Qemu-devel] [PATCH] block/mirror: Always call block_job_sleep_ns()

[Max Reitz]

The mirror block job is trying to take a clever shortcut if delay_ns is
0 and skips block_job_sleep_ns() in that case. But that function must be
called in every block job iteration, because otherwise it is for example
impossible to pause the job.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
This makes test 129 pass when run in tmpfs (for me, at least).
---
 block/mirror.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/block/mirror.c b/block/mirror.c
index d53e60e..58f391a 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -482,9 +482,6 @@ static void coroutine_fn mirror_run(void *opaque)
                 continue;
             } else if (cnt != 0) {
                 delay_ns = mirror_iteration(s);
-                if (delay_ns == 0) {
-                    continue;
-                }
             }
         }
 
-- 
2.3.5

Re: [Qemu-devel] [PATCH] block/mirror: Always call block_job_sleep_ns()

[Paolo Bonzini]

On 27/04/2015 13:07, Max Reitz wrote:
> The mirror block job is trying to take a clever shortcut if delay_ns is
> 0 and skips block_job_sleep_ns() in that case. But that function must be
> called in every block job iteration, because otherwise it is for example
> impossible to pause the job.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> This makes test 129 pass when run in tmpfs (for me, at least).

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Re: [Qemu-devel] [PATCH] block/mirror: Always call block_job_sleep_ns()

[Fam Zheng]

On Mon, 04/27 13:07, Max Reitz wrote:
> The mirror block job is trying to take a clever shortcut if delay_ns is
> 0 and skips block_job_sleep_ns() in that case. But that function must be
> called in every block job iteration, because otherwise it is for example
> impossible to pause the job.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> This makes test 129 pass when run in tmpfs (for me, at least).

Looks good to me. Thanks for debugging the failure!

Reviewed-by: Fam Zheng <famz@redhat.com>

> ---
>  block/mirror.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/block/mirror.c b/block/mirror.c
> index d53e60e..58f391a 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -482,9 +482,6 @@ static void coroutine_fn mirror_run(void *opaque)
>                  continue;
>              } else if (cnt != 0) {
>                  delay_ns = mirror_iteration(s);
> -                if (delay_ns == 0) {
> -                    continue;
> -                }
>              }
>          }
>  
> -- 
> 2.3.5
> 

Re: [Qemu-devel] [PATCH] block/mirror: Always call block_job_sleep_ns()

[Kevin Wolf]

Am 27.04.2015 um 13:07 hat Max Reitz geschrieben:
> The mirror block job is trying to take a clever shortcut if delay_ns is
> 0 and skips block_job_sleep_ns() in that case. But that function must be
> called in every block job iteration, because otherwise it is for example
> impossible to pause the job.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> This makes test 129 pass when run in tmpfs (for me, at least).

Thanks, applied to the block branch.

Kevin