[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/8] migration: Don't return for postcopy_chunk_hostpages()
From: |
Peter Xu |
Subject: |
[PATCH v3 2/8] migration: Don't return for postcopy_chunk_hostpages() |
Date: |
Fri, 24 Dec 2021 14:49:54 +0800 |
It always return zero, because it just can't go wrong so far. Simplify the
code with no functional change.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/ram.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 7d9c8a508b..0ed0f51a09 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2580,12 +2580,10 @@ static void
postcopy_chunk_hostpages_pass(MigrationState *ms, RAMBlock *block)
* dirty host-page size chunks as all dirty. In this case the host-page
* is the host-page for the particular RAMBlock, i.e. it might be a huge page
*
- * Returns zero on success
- *
* @ms: current migration state
* @block: block we want to work with
*/
-static int postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block)
+static void postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block)
{
postcopy_discard_send_init(ms, block->idstr);
@@ -2595,7 +2593,6 @@ static int postcopy_chunk_hostpages(MigrationState *ms,
RAMBlock *block)
postcopy_chunk_hostpages_pass(ms, block);
postcopy_discard_send_finish(ms);
- return 0;
}
/**
@@ -2617,7 +2614,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
{
RAMState *rs = ram_state;
RAMBlock *block;
- int ret;
RCU_READ_LOCK_GUARD();
@@ -2631,10 +2627,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
RAMBLOCK_FOREACH_NOT_IGNORED(block) {
/* Deal with TPS != HPS and huge pages */
- ret = postcopy_chunk_hostpages(ms, block);
- if (ret) {
- return ret;
- }
+ postcopy_chunk_hostpages(ms, block);
}
trace_ram_postcopy_send_discard_bitmap();
--
2.32.0
- [PATCH v3 0/8] migration: Postcopy cleanup on ram disgard, Peter Xu, 2021/12/24
- [PATCH v3 2/8] migration: Don't return for postcopy_chunk_hostpages(),
Peter Xu <=
- [PATCH v3 4/8] migration: Do chunk page in postcopy_each_ram_send_discard(), Peter Xu, 2021/12/24
- [PATCH v3 6/8] migration: Dump sub-cmd name in loadvm_process_command tp, Peter Xu, 2021/12/24
- [PATCH v3 1/8] migration: Drop dead code of ram_debug_dump_bitmap(), Peter Xu, 2021/12/24
- [PATCH v3 5/8] migration: Drop return code for disgard ram process, Peter Xu, 2021/12/24
- [PATCH v3 3/8] migration: Drop postcopy_chunk_hostpages(), Peter Xu, 2021/12/24