Re: [Qemu-devel] [PATCH v2 1/8] multifd: Only send pages when packet are not empty

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> We send packages without pages sometimes for sysnchronizanion.  The
> iov functions do the right thing, but we will be changing this code in
> future patches.
> 
> Signed-off-by: Juan Quintela <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/ram.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index 59191c1ed2..8b5fd67d66 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1025,9 +1025,12 @@ static void *multifd_send_thread(void *opaque)
>                  break;
>              }
>  
> -            ret = qio_channel_writev_all(p->c, p->pages->iov, used, 
> &local_err);
> -            if (ret != 0) {
> -                break;
> +            if (used) {
> +                ret = qio_channel_writev_all(p->c, p->pages->iov,
> +                                             used, &local_err);
> +                if (ret != 0) {
> +                    break;
> +                }
>              }
>  
>              qemu_mutex_lock(&p->mutex);
> @@ -1254,9 +1257,12 @@ static void *multifd_recv_thread(void *opaque)
>          p->num_pages += used;
>          qemu_mutex_unlock(&p->mutex);
>  
> -        ret = qio_channel_readv_all(p->c, p->pages->iov, used, &local_err);
> -        if (ret != 0) {
> -            break;
> +        if (used) {
> +            ret = qio_channel_readv_all(p->c, p->pages->iov,
> +                                        used, &local_err);
> +            if (ret != 0) {
> +                break;
> +            }
>          }
>  
>          if (flags & MULTIFD_FLAG_SYNC) {
> -- 
> 2.20.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK