* Juan Quintela (quint...@redhat.com) wrote:
> It is already there as p->pages->num.
>
> 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 | 7 +++----
> migration/multifd-zstd.c | 7 +++----
> migration/multifd.c | 9 +++------
> 4 files changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/migration/multifd.h b/migration/multifd.h
> index 86820dd028..7968cc5c20 100644
> --- a/migration/multifd.h
> +++ b/migration/multifd.h
> @@ -159,7 +159,7 @@ typedef struct {
> /* Cleanup for sending side */
> void (*send_cleanup)(MultiFDSendParams *p, Error **errp);
> /* Prepare the send packet */
> - int (*send_prepare)(MultiFDSendParams *p, uint32_t used, Error **errp);
> + 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 */
> diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
> index d0437cce2a..28f0ed933b 100644
> --- a/migration/multifd-zlib.c
> +++ b/migration/multifd-zlib.c
> @@ -94,10 +94,9 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error
> **errp)
> * 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_prepare(MultiFDSendParams *p, uint32_t used, Error
> **errp)
> +static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)
> {
> struct iovec *iov = p->pages->iov;
> struct zlib_data *z = p->data;
> @@ -106,11 +105,11 @@ static int zlib_send_prepare(MultiFDSendParams *p,
> uint32_t used, Error **errp)
> int ret;
> uint32_t i;
>
> - for (i = 0; i < used; i++) {
> + for (i = 0; i < p->pages->num; i++) {
> uint32_t available = z->zbuff_len - out_size;
> int flush = Z_NO_FLUSH;
>
> - if (i == used - 1) {
> + if (i == p->pages->num - 1) {
> flush = Z_SYNC_FLUSH;
> }
>
> diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
> index 09ae1cf91a..4a71e96e06 100644
> --- a/migration/multifd-zstd.c
> +++ b/migration/multifd-zstd.c
> @@ -107,10 +107,9 @@ static void zstd_send_cleanup(MultiFDSendParams *p,
> Error **errp)
> * 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_prepare(MultiFDSendParams *p, uint32_t used, Error
> **errp)
> +static int zstd_send_prepare(MultiFDSendParams *p, Error **errp)
> {
> struct iovec *iov = p->pages->iov;
> struct zstd_data *z = p->data;
> @@ -121,10 +120,10 @@ static int zstd_send_prepare(MultiFDSendParams *p,
> uint32_t used, Error **errp)
> z->out.size = z->zbuff_len;
> z->out.pos = 0;
>
> - for (i = 0; i < used; i++) {
> + for (i = 0; i < p->pages->num; i++) {
> ZSTD_EndDirective flush = ZSTD_e_continue;
>
> - if (i == used - 1) {
> + if (i == p->pages->num - 1) {
> flush = ZSTD_e_flush;
> }
> z->in.src = iov[i].iov_base;
> diff --git a/migration/multifd.c b/migration/multifd.c
> index ce7101cf9d..098ef8842c 100644
> --- a/migration/multifd.c
> +++ b/migration/multifd.c
> @@ -82,13 +82,11 @@ static void nocomp_send_cleanup(MultiFDSendParams *p,
> Error **errp)
> * 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_prepare(MultiFDSendParams *p, uint32_t used,
> - Error **errp)
> +static int nocomp_send_prepare(MultiFDSendParams *p, Error **errp)
> {
> - p->next_packet_size = used * qemu_target_page_size();
> + p->next_packet_size = p->pages->num * qemu_target_page_size();
> p->flags |= MULTIFD_FLAG_NOCOMP;
> return 0;
> }
> @@ -654,8 +652,7 @@ static void *multifd_send_thread(void *opaque)
> uint32_t flags = p->flags;
>
> if (used) {
> - ret = multifd_send_state->ops->send_prepare(p, used,
> - &local_err);
> + ret = multifd_send_state->ops->send_prepare(p, &local_err);
> if (ret != 0) {
> qemu_mutex_unlock(&p->mutex);
> break;
> --
> 2.33.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
