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

migration/multifd: Change retval of multifd_send_pages() 

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>
This commit is contained in:
Peter Xu 2024-02-02 18:28:51 +08:00
parent d6556d174a
commit 3b40964a86
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
migration/multifd.c
View File

@ -449,9 +449,10 @@ static void multifd_send_kick_main(MultiFDSendParams *p)
* thread is using the channel mutex when changing it, and the channel * 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 * have to had finish with its own, otherwise pending_job can't be
* false. * false.
*
* Returns true if succeed, false otherwise.
*/ */
static bool multifd_send_pages(void)
static int multifd_send_pages(void)
{ {
int i; int i;
static int next_channel; static int next_channel;
@ -459,7 +460,7 @@ static int multifd_send_pages(void)
MultiFDPages_t *pages = multifd_send_state->pages; MultiFDPages_t *pages = multifd_send_state->pages;
if (multifd_send_should_exit()) { if (multifd_send_should_exit()) {
return -1; return false;
} }
/* We wait here, until at least one channel is ready */ /* We wait here, until at least one channel is ready */
@ -473,7 +474,7 @@ static int multifd_send_pages(void)
next_channel %= migrate_multifd_channels(); next_channel %= migrate_multifd_channels();
for (i = next_channel;; i = (i + 1) % migrate_multifd_channels()) { for (i = next_channel;; i = (i + 1) % migrate_multifd_channels()) {
if (multifd_send_should_exit()) { if (multifd_send_should_exit()) {
return -1; return false;
} }
p = &multifd_send_state->params[i]; p = &multifd_send_state->params[i];
/* /*
@ -502,7 +503,7 @@ static int multifd_send_pages(void)
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
qemu_sem_post(&p->sem); qemu_sem_post(&p->sem);
return 1; return true;
} }
/* Returns true if enqueue successful, false otherwise */ /* Returns true if enqueue successful, false otherwise */
@ -526,7 +527,7 @@ bool multifd_queue_page(RAMBlock *block, ram_addr_t offset)
changed = true; changed = true;
} }
if (multifd_send_pages() < 0) { if (!multifd_send_pages()) {
return false; return false;
} }
@ -666,7 +667,7 @@ int multifd_send_sync_main(void)
return 0; return 0;
} }
if (multifd_send_state->pages->num) { if (multifd_send_state->pages->num) {
if (multifd_send_pages() < 0) { if (!multifd_send_pages()) {
error_report("%s: multifd_send_pages fail", __func__); error_report("%s: multifd_send_pages fail", __func__);
return -1; return -1;
} }