* Juan Quintela (quint...@redhat.com) wrote:
> Everything use now iov's.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> migration/multifd.h | 2 --
> migration/multifd-zlib.c | 17 -----------------
> migration/multifd-zstd.c | 17 -----------------
> migration/multifd.c | 20 ++------------------
> 4 files changed, 2 insertions(+), 54 deletions(-)
>
> diff --git a/migration/multifd.h b/migration/multifd.h
> index c3f18af364..7496f951a7 100644
> --- a/migration/multifd.h
> +++ b/migration/multifd.h
> @@ -164,8 +164,6 @@ typedef struct {
> void (*send_cleanup)(MultiFDSendParams *p, Error **errp);
> /* Prepare the send packet */
> int (*send_prepare)(MultiFDSendParams *p, Error **errp);
> - /* Write the send packet */
> - int (*send_write)(MultiFDSendParams *p, uint32_t used, Error **errp);
> /* Setup for receiving side */
> int (*recv_setup)(MultiFDRecvParams *p, Error **errp);
> /* Cleanup for receiving side */
> diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
> index 71480c82bb..ba90f1aaf4 100644
> --- a/migration/multifd-zlib.c
> +++ b/migration/multifd-zlib.c
> @@ -152,22 +152,6 @@ static int zlib_send_prepare(MultiFDSendParams *p, Error
> **errp)
> return 0;
> }
>
> -/**
> - * zlib_send_write: do the actual write of the data
> - *
> - * Do the actual write of the comprresed buffer.
> - *
> - * Returns 0 for success or -1 for error
> - *
> - * @p: Params for the channel that we are using
> - * @used: number of pages used
> - * @errp: pointer to an error
> - */
> -static int zlib_send_write(MultiFDSendParams *p, uint32_t used, Error **errp)
> -{
> - return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp);
> -}
> -
> /**
> * zlib_recv_setup: setup receive side
> *
> @@ -307,7 +291,6 @@ static MultiFDMethods multifd_zlib_ops = {
> .send_setup = zlib_send_setup,
> .send_cleanup = zlib_send_cleanup,
> .send_prepare = zlib_send_prepare,
> - .send_write = zlib_send_write,
> .recv_setup = zlib_recv_setup,
> .recv_cleanup = zlib_recv_cleanup,
> .recv_pages = zlib_recv_pages
> diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
> index bd393aee0d..757434d1ee 100644
> --- a/migration/multifd-zstd.c
> +++ b/migration/multifd-zstd.c
> @@ -163,22 +163,6 @@ static int zstd_send_prepare(MultiFDSendParams *p, Error
> **errp)
> return 0;
> }
>
> -/**
> - * zstd_send_write: do the actual write of the data
> - *
> - * Do the actual write of the comprresed buffer.
> - *
> - * Returns 0 for success or -1 for error
> - *
> - * @p: Params for the channel that we are using
> - * @used: number of pages used
> - * @errp: pointer to an error
> - */
> -static int zstd_send_write(MultiFDSendParams *p, uint32_t used, Error **errp)
> -{
> - return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp);
> -}
> -
> /**
> * zstd_recv_setup: setup receive side
> *
> @@ -320,7 +304,6 @@ static MultiFDMethods multifd_zstd_ops = {
> .send_setup = zstd_send_setup,
> .send_cleanup = zstd_send_cleanup,
> .send_prepare = zstd_send_prepare,
> - .send_write = zstd_send_write,
> .recv_setup = zstd_recv_setup,
> .recv_cleanup = zstd_recv_cleanup,
> .recv_pages = zstd_recv_pages
> diff --git a/migration/multifd.c b/migration/multifd.c
> index f75bd3c188..96b9cc0d8b 100644
> --- a/migration/multifd.c
> +++ b/migration/multifd.c
> @@ -100,22 +100,6 @@ static int nocomp_send_prepare(MultiFDSendParams *p,
> Error **errp)
> return 0;
> }
>
> -/**
> - * nocomp_send_write: do the actual write of the data
> - *
> - * For no compression we just have to write the data.
> - *
> - * Returns 0 for success or -1 for error
> - *
> - * @p: Params for the channel that we are using
> - * @used: number of pages used
> - * @errp: pointer to an error
> - */
> -static int nocomp_send_write(MultiFDSendParams *p, uint32_t used, Error
> **errp)
> -{
> - return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp);
> -}
> -
> /**
> * nocomp_recv_setup: setup receive side
> *
> @@ -173,7 +157,6 @@ static MultiFDMethods multifd_nocomp_ops = {
> .send_setup = nocomp_send_setup,
> .send_cleanup = nocomp_send_cleanup,
> .send_prepare = nocomp_send_prepare,
> - .send_write = nocomp_send_write,
> .recv_setup = nocomp_recv_setup,
> .recv_cleanup = nocomp_recv_cleanup,
> .recv_pages = nocomp_recv_pages
> @@ -690,7 +673,8 @@ static void *multifd_send_thread(void *opaque)
> }
>
> if (used) {
> - ret = multifd_send_state->ops->send_write(p, used,
> &local_err);
> + ret = qio_channel_writev_all(p->c, p->iov, p->iovs_num,
> + &local_err);
> if (ret != 0) {
> break;
> }
> --
> 2.34.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
