ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

multifd: remove used parameter from send_prepare() method 

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:08:08 +01:00
parent 1943c11a62
commit 02fb81043e
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/multifd-zlib.c
View File

@ -94,10 +94,9 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error **errp)
* 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_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 iovec *iov = p->pages->iov;
struct zlib_data *z = p->data; struct zlib_data *z = p->data;
@ -106,11 +105,11 @@ static int zlib_send_prepare(MultiFDSendParams *p, uint32_t used, Error **errp)
int ret; int ret;
uint32_t i; 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; uint32_t available = z->zbuff_len - out_size;
int flush = Z_NO_FLUSH; int flush = Z_NO_FLUSH;
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

@ -107,10 +107,9 @@ static void zstd_send_cleanup(MultiFDSendParams *p, Error **errp)
* 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_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 iovec *iov = p->pages->iov;
struct zstd_data *z = p->data; 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.size = z->zbuff_len;
z->out.pos = 0; z->out.pos = 0;
for (i = 0; i < used; i++) { for (i = 0; i < p->pages->num; i++) {
ZSTD_EndDirective flush = ZSTD_e_continue; ZSTD_EndDirective flush = ZSTD_e_continue;
if (i == used - 1) { if (i == p->pages->num - 1) {
flush = ZSTD_e_flush; flush = ZSTD_e_flush;
} }
z->in.src = iov[i].iov_base; z->in.src = iov[i].iov_base;

9
migration/multifd.c
View File

@ -82,13 +82,11 @@ static void nocomp_send_cleanup(MultiFDSendParams *p, Error **errp)
* 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_send_prepare(MultiFDSendParams *p, uint32_t used, static int nocomp_send_prepare(MultiFDSendParams *p, Error **errp)
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; p->flags |= MULTIFD_FLAG_NOCOMP;
return 0; return 0;
} }
@ -654,8 +652,7 @@ static void *multifd_send_thread(void *opaque)
uint32_t flags = p->flags; uint32_t flags = p->flags;
if (used) { if (used) {
ret = multifd_send_state->ops->send_prepare(p, used, ret = multifd_send_state->ops->send_prepare(p, &local_err);
&local_err);
if (ret != 0) { if (ret != 0) {
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
break; break;

2
migration/multifd.h
View File

@ -159,7 +159,7 @@ typedef struct {
/* Cleanup for sending side */ /* Cleanup for sending side */
void (*send_cleanup)(MultiFDSendParams *p, Error **errp); void (*send_cleanup)(MultiFDSendParams *p, Error **errp);
/* Prepare the send packet */ /* 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 */ /* Write the send packet */
int (*send_write)(MultiFDSendParams *p, uint32_t used, Error **errp); int (*send_write)(MultiFDSendParams *p, uint32_t used, Error **errp);
/* Setup for receiving side */ /* Setup for receiving side */