[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/7] migration: Don't return for postcopy_chunk_hostpages()
From: |
Peter Xu |
Subject: |
[PATCH 2/7] migration: Don't return for postcopy_chunk_hostpages() |
Date: |
Tue, 7 Dec 2021 19:50:11 +0800 |
It always return zero, because it just can't go wrong so far. Simplify the
code with no functional change.
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 756ac800a7..fb8c1a887e 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2585,12 +2585,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);
@@ -2600,7 +2598,6 @@ static int postcopy_chunk_hostpages(MigrationState *ms,
RAMBlock *block)
postcopy_chunk_hostpages_pass(ms, block);
postcopy_discard_send_finish(ms);
- return 0;
}
/**
@@ -2622,7 +2619,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
{
RAMState *rs = ram_state;
RAMBlock *block;
- int ret;
RCU_READ_LOCK_GUARD();
@@ -2636,10 +2632,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 0/7] migration: Postcopy cleanup on ram disgard, Peter Xu, 2021/12/07
- [PATCH 2/7] migration: Don't return for postcopy_chunk_hostpages(),
Peter Xu <=
- [PATCH 1/7] migration: Drop dead code of ram_debug_dump_bitmap(), Peter Xu, 2021/12/07
- [PATCH 3/7] migration: Drop postcopy_chunk_hostpages(), Peter Xu, 2021/12/07
- [PATCH 4/7] migration: Do chunk page in postcopy_each_ram_send_discard(), Peter Xu, 2021/12/07
- [PATCH 5/7] migration: Drop return code for disgard ram process, Peter Xu, 2021/12/07
- [PATCH 6/7] migration: Dump sub-cmd name in loadvm_process_command tp, Peter Xu, 2021/12/07