Skip to content

Commit

Permalink
migration/multifd: Change retval of multifd_send_pages()
Browse files Browse the repository at this point in the history
Using int is an overkill when there're only two options.  Change it to a
boolean.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240202102857.110210-18-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
  • Loading branch information
xzpeter committed Feb 5, 2024
1 parent d6556d1 commit 3b40964
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions migration/multifd.c
Original file line number Diff line number Diff line change
Expand Up @@ -449,17 +449,18 @@ static void multifd_send_kick_main(MultiFDSendParams *p)
* thread is using the channel mutex when changing it, and the channel
* have to had finish with its own, otherwise pending_job can't be
* false.
*
* Returns true if succeed, false otherwise.
*/

static int multifd_send_pages(void)
static bool multifd_send_pages(void)
{
int i;
static int next_channel;
MultiFDSendParams *p = NULL; /* make happy gcc */
MultiFDPages_t *pages = multifd_send_state->pages;

if (multifd_send_should_exit()) {
return -1;
return false;
}

/* We wait here, until at least one channel is ready */
Expand All @@ -473,7 +474,7 @@ static int multifd_send_pages(void)
next_channel %= migrate_multifd_channels();
for (i = next_channel;; i = (i + 1) % migrate_multifd_channels()) {
if (multifd_send_should_exit()) {
return -1;
return false;
}
p = &multifd_send_state->params[i];
/*
Expand Down Expand Up @@ -502,7 +503,7 @@ static int multifd_send_pages(void)
qemu_mutex_unlock(&p->mutex);
qemu_sem_post(&p->sem);

return 1;
return true;
}

/* Returns true if enqueue successful, false otherwise */
Expand All @@ -526,7 +527,7 @@ bool multifd_queue_page(RAMBlock *block, ram_addr_t offset)
changed = true;
}

if (multifd_send_pages() < 0) {
if (!multifd_send_pages()) {
return false;
}

Expand Down Expand Up @@ -666,7 +667,7 @@ int multifd_send_sync_main(void)
return 0;
}
if (multifd_send_state->pages->num) {
if (multifd_send_pages() < 0) {
if (!multifd_send_pages()) {
error_report("%s: multifd_send_pages fail", __func__);
return -1;
}
Expand Down

0 comments on commit 3b40964

Please sign in to comment.