mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multifd: remove used parameter from send_recv_pages() method

Browse Source 
It is already there as p->pages->num.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2021-11-22 12:49:43 +01:00
parent 02fb81043e
commit 40a4bfe9d3
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
migration/multifd-zlib.c
View File

@ -230,17 +230,16 @@ static void zlib_recv_cleanup(MultiFDRecvParams *p)
* Returns 0 for success or -1 for error * Returns 0 for success or -1 for error
* *
* @p: Params for the channel that we are using * @p: Params for the channel that we are using
* @used: number of pages used
* @errp: pointer to an error * @errp: pointer to an error
*/ */
static int zlib_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp) static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp)
{ {
struct zlib_data *z = p->data; struct zlib_data *z = p->data;
z_stream *zs = &z->zs; z_stream *zs = &z->zs;
uint32_t in_size = p->next_packet_size; uint32_t in_size = p->next_packet_size;
/* we measure the change of total_out */ /* we measure the change of total_out */
uint32_t out_size = zs->total_out; uint32_t out_size = zs->total_out;
uint32_t expected_size = used * qemu_target_page_size(); uint32_t expected_size = p->pages->num * qemu_target_page_size();
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK; uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
int ret; int ret;
int i; int i;
@ -259,12 +258,12 @@ static int zlib_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
zs->avail_in = in_size; zs->avail_in = in_size;
zs->next_in = z->zbuff; zs->next_in = z->zbuff;
for (i = 0; i < used; i++) { for (i = 0; i < p->pages->num; i++) {
struct iovec *iov = &p->pages->iov[i]; struct iovec *iov = &p->pages->iov[i];
int flush = Z_NO_FLUSH; int flush = Z_NO_FLUSH;
unsigned long start = zs->total_out; unsigned long start = zs->total_out;
if (i == used - 1) { if (i == p->pages->num - 1) {
flush = Z_SYNC_FLUSH; flush = Z_SYNC_FLUSH;
} }

7
migration/multifd-zstd.c
View File

@ -250,14 +250,13 @@ static void zstd_recv_cleanup(MultiFDRecvParams *p)
* Returns 0 for success or -1 for error * Returns 0 for success or -1 for error
* *
* @p: Params for the channel that we are using * @p: Params for the channel that we are using
* @used: number of pages used
* @errp: pointer to an error * @errp: pointer to an error
*/ */
static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp) static int zstd_recv_pages(MultiFDRecvParams *p, Error **errp)
{ {
uint32_t in_size = p->next_packet_size; uint32_t in_size = p->next_packet_size;
uint32_t out_size = 0; uint32_t out_size = 0;
uint32_t expected_size = used * qemu_target_page_size(); uint32_t expected_size = p->pages->num * qemu_target_page_size();
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK; uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
struct zstd_data *z = p->data; struct zstd_data *z = p->data;
int ret; int ret;
@ -278,7 +277,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
z->in.size = in_size; z->in.size = in_size;
z->in.pos = 0; z->in.pos = 0;
for (i = 0; i < used; i++) { for (i = 0; i < p->pages->num; i++) {
struct iovec *iov = &p->pages->iov[i]; struct iovec *iov = &p->pages->iov[i];
z->out.dst = iov->iov_base; z->out.dst = iov->iov_base;

7
migration/multifd.c
View File

@ -141,10 +141,9 @@ static void nocomp_recv_cleanup(MultiFDRecvParams *p)
* Returns 0 for success or -1 for error * Returns 0 for success or -1 for error
* *
* @p: Params for the channel that we are using * @p: Params for the channel that we are using
* @used: number of pages used
* @errp: pointer to an error * @errp: pointer to an error
*/ */
static int nocomp_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp) static int nocomp_recv_pages(MultiFDRecvParams *p, Error **errp)
{ {
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK; uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
@ -153,7 +152,7 @@ static int nocomp_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
p->id, flags, MULTIFD_FLAG_NOCOMP); p->id, flags, MULTIFD_FLAG_NOCOMP);
return -1; return -1;
} }
return qio_channel_readv_all(p->c, p->pages->iov, used, errp); return qio_channel_readv_all(p->c, p->pages->iov, p->pages->num, errp);
} }
static MultiFDMethods multifd_nocomp_ops = { static MultiFDMethods multifd_nocomp_ops = {
@ -1099,7 +1098,7 @@ static void *multifd_recv_thread(void *opaque)
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
if (used) { if (used) {
ret = multifd_recv_state->ops->recv_pages(p, used, &local_err); ret = multifd_recv_state->ops->recv_pages(p, &local_err);
if (ret != 0) { if (ret != 0) {
break; break;
} }

2
migration/multifd.h
View File

@ -167,7 +167,7 @@ typedef struct {
/* Cleanup for receiving side */ /* Cleanup for receiving side */
void (*recv_cleanup)(MultiFDRecvParams *p); void (*recv_cleanup)(MultiFDRecvParams *p);
/* Read all pages */ /* Read all pages */
int (*recv_pages)(MultiFDRecvParams *p, uint32_t used, Error **errp); int (*recv_pages)(MultiFDRecvParams *p, Error **errp);
} MultiFDMethods; } MultiFDMethods;
void multifd_register_ops(int method, MultiFDMethods *ops); void multifd_register_ops(int method, MultiFDMethods *ops);