aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2024-02-02 18:28:50 +0800
committerPeter Xu <peterx@redhat.com>2024-02-05 14:42:10 +0800
commitd6556d174a6b9fc443f2320193f18e71eb67052a (patch)
treed4dda39931d71af75d5afd9ce8262bf90536162b
parent3ab4441d97af59ea09ee015d68c4770704b2b34f (diff)
downloadqemu-d6556d174a6b9fc443f2320193f18e71eb67052a.zip
qemu-d6556d174a6b9fc443f2320193f18e71eb67052a.tar.gz
qemu-d6556d174a6b9fc443f2320193f18e71eb67052a.tar.bz2
migration/multifd: Change retval of multifd_queue_page()
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-17-peterx@redhat.com Signed-off-by: Peter Xu <peterx@redhat.com>
-rw-r--r--migration/multifd.c9
-rw-r--r--migration/multifd.h2
-rw-r--r--migration/ram.c2
3 files changed, 7 insertions, 6 deletions
diff --git a/migration/multifd.c b/migration/multifd.c
index ba86f9d..12e587f 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -505,7 +505,8 @@ static int multifd_send_pages(void)
return 1;
}
-int multifd_queue_page(RAMBlock *block, ram_addr_t offset)
+/* Returns true if enqueue successful, false otherwise */
+bool multifd_queue_page(RAMBlock *block, ram_addr_t offset)
{
MultiFDPages_t *pages = multifd_send_state->pages;
bool changed = false;
@@ -519,21 +520,21 @@ int multifd_queue_page(RAMBlock *block, ram_addr_t offset)
pages->num++;
if (pages->num < pages->allocated) {
- return 1;
+ return true;
}
} else {
changed = true;
}
if (multifd_send_pages() < 0) {
- return -1;
+ return false;
}
if (changed) {
return multifd_queue_page(block, offset);
}
- return 1;
+ return true;
}
/* Multifd send side hit an error; remember it and prepare to quit */
diff --git a/migration/multifd.h b/migration/multifd.h
index 34a2ecb..a320c53 100644
--- a/migration/multifd.h
+++ b/migration/multifd.h
@@ -22,7 +22,7 @@ bool multifd_recv_all_channels_created(void);
void multifd_recv_new_channel(QIOChannel *ioc, Error **errp);
void multifd_recv_sync_main(void);
int multifd_send_sync_main(void);
-int multifd_queue_page(RAMBlock *block, ram_addr_t offset);
+bool multifd_queue_page(RAMBlock *block, ram_addr_t offset);
/* Multifd Compression flags */
#define MULTIFD_FLAG_SYNC (1 << 0)
diff --git a/migration/ram.c b/migration/ram.c
index d5b7cd5..4649a81 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1252,7 +1252,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss)
static int ram_save_multifd_page(RAMBlock *block, ram_addr_t offset)
{
- if (multifd_queue_page(block, offset) < 0) {
+ if (!multifd_queue_page(block, offset)) {
return -1;
}
stat64_add(&mig_stats.normal_pages, 1);