[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/23] migration/multifd: Change retval of multifd_queue_page(
From: |
peterx |
Subject: |
[PATCH v2 16/23] migration/multifd: Change retval of multifd_queue_page() |
Date: |
Fri, 2 Feb 2024 18:28:50 +0800 |
From: Peter Xu <peterx@redhat.com>
Using int is an overkill when there're only two options. Change it to a
boolean.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/multifd.h | 2 +-
migration/multifd.c | 9 +++++----
migration/ram.c | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/migration/multifd.h b/migration/multifd.h
index 34a2ecb9f4..a320c53a6f 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/multifd.c b/migration/multifd.c
index ba86f9dda5..12e587fda8 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/ram.c b/migration/ram.c
index d5b7cd5ac2..4649a81204 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);
--
2.43.0
- [PATCH v2 10/23] migration/multifd: Move total_normal_pages accounting, (continued)
- [PATCH v2 10/23] migration/multifd: Move total_normal_pages accounting, peterx, 2024/02/02
- [PATCH v2 11/23] migration/multifd: Move trace_multifd_send|recv(), peterx, 2024/02/02
- [PATCH v2 13/23] migration/multifd: Move header prepare/fill into send_prepare(), peterx, 2024/02/02
- [PATCH v2 12/23] migration/multifd: multifd_send_prepare_header(), peterx, 2024/02/02
- [PATCH v2 14/23] migration/multifd: Forbid spurious wakeups, peterx, 2024/02/02
- [PATCH v2 15/23] migration/multifd: Split multifd_send_terminate_threads(), peterx, 2024/02/02
- [PATCH v2 17/23] migration/multifd: Change retval of multifd_send_pages(), peterx, 2024/02/02
- [PATCH v2 16/23] migration/multifd: Change retval of multifd_queue_page(),
peterx <=
- [PATCH v2 18/23] migration/multifd: Rewrite multifd_queue_page(), peterx, 2024/02/02
- [PATCH v2 19/23] migration/multifd: Cleanup multifd_save_cleanup(), peterx, 2024/02/02
- [PATCH v2 20/23] migration/multifd: Cleanup multifd_load_cleanup(), peterx, 2024/02/02
- [PATCH v2 21/23] migration/multifd: Stick with send/recv on function names, peterx, 2024/02/02