[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/36] migration: Drop return code for disgard ram process
From: |
Juan Quintela |
Subject: |
[PULL 28/36] migration: Drop return code for disgard ram process |
Date: |
Fri, 28 Jan 2022 19:30:25 +0100 |
From: Peter Xu <peterx@redhat.com>
It will just never fail. Drop those return values where they're constantly
zeros.
A tiny touch-up on the tracepoint so trace_ram_postcopy_send_discard_bitmap()
is called after the logic itself (which sounds more reasonable).
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.h | 2 +-
migration/migration.c | 5 +----
migration/ram.c | 20 +++++---------------
3 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/migration/ram.h b/migration/ram.h
index f543e25765..2c6dc3675d 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -57,7 +57,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t
start, ram_addr_t len);
void acct_update_position(QEMUFile *f, size_t size, bool zero);
void ram_postcopy_migrated_memory_release(MigrationState *ms);
/* For outgoing discard bitmap */
-int ram_postcopy_send_discard_bitmap(MigrationState *ms);
+void ram_postcopy_send_discard_bitmap(MigrationState *ms);
/* For incoming postcopy discard */
int ram_discard_range(const char *block_name, uint64_t start, size_t length);
int ram_postcopy_incoming_init(MigrationIncomingState *mis);
diff --git a/migration/migration.c b/migration/migration.c
index 3849b33108..771f3e2bec 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2991,10 +2991,7 @@ static int postcopy_start(MigrationState *ms)
* that are dirty
*/
if (migrate_postcopy_ram()) {
- if (ram_postcopy_send_discard_bitmap(ms)) {
- error_report("postcopy send discard bitmap failed");
- goto fail;
- }
+ ram_postcopy_send_discard_bitmap(ms);
}
/*
diff --git a/migration/ram.c b/migration/ram.c
index d74a8c04b6..5489ee3b7a 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2459,8 +2459,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState
*ms, RAMBlock *block);
/**
* postcopy_each_ram_send_discard: discard all RAMBlocks
*
- * Returns 0 for success or negative for error
- *
* Utility for the outgoing postcopy code.
* Calls postcopy_send_discard_bm_ram for each RAMBlock
* passing it bitmap indexes and name.
@@ -2469,10 +2467,9 @@ static void postcopy_chunk_hostpages_pass(MigrationState
*ms, RAMBlock *block);
*
* @ms: current migration state
*/
-static int postcopy_each_ram_send_discard(MigrationState *ms)
+static void postcopy_each_ram_send_discard(MigrationState *ms)
{
struct RAMBlock *block;
- int ret;
RAMBLOCK_FOREACH_NOT_IGNORED(block) {
postcopy_discard_send_init(ms, block->idstr);
@@ -2490,14 +2487,9 @@ static int postcopy_each_ram_send_discard(MigrationState
*ms)
* just needs indexes at this point, avoids it having
* target page specific code.
*/
- ret = postcopy_send_discard_bm_ram(ms, block);
+ postcopy_send_discard_bm_ram(ms, block);
postcopy_discard_send_finish(ms);
- if (ret) {
- return ret;
- }
}
-
- return 0;
}
/**
@@ -2570,8 +2562,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState
*ms, RAMBlock *block)
/**
* ram_postcopy_send_discard_bitmap: transmit the discard bitmap
*
- * Returns zero on success
- *
* Transmit the set of pages to be discarded after precopy to the target
* these are pages that:
* a) Have been previously transmitted but are now dirty again
@@ -2582,7 +2572,7 @@ static void postcopy_chunk_hostpages_pass(MigrationState
*ms, RAMBlock *block)
*
* @ms: current migration state
*/
-int ram_postcopy_send_discard_bitmap(MigrationState *ms)
+void ram_postcopy_send_discard_bitmap(MigrationState *ms)
{
RAMState *rs = ram_state;
@@ -2596,9 +2586,9 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
rs->last_sent_block = NULL;
rs->last_page = 0;
+ postcopy_each_ram_send_discard(ms);
+
trace_ram_postcopy_send_discard_bitmap();
-
- return postcopy_each_ram_send_discard(ms);
}
/**
--
2.34.1
- [PULL 19/36] migration/migration.c: Add missed default error handler for migration state, (continued)
- [PULL 19/36] migration/migration.c: Add missed default error handler for migration state, Juan Quintela, 2022/01/28
- [PULL 18/36] Remove unnecessary minimum_version_id_old fields, Juan Quintela, 2022/01/28
- [PULL 20/36] migration/migration.c: Avoid COLO boot in postcopy migration, Juan Quintela, 2022/01/28
- [PULL 21/36] migration/migration.c: Remove the MIGRATION_STATUS_ACTIVE when migration finished, Juan Quintela, 2022/01/28
- [PULL 22/36] migration: Report the error returned when save_live_iterate fails, Juan Quintela, 2022/01/28
- [PULL 23/36] migration/ram: clean up unused comment., Juan Quintela, 2022/01/28
- [PULL 25/36] migration: Don't return for postcopy_chunk_hostpages(), Juan Quintela, 2022/01/28
- [PULL 24/36] migration: Drop dead code of ram_debug_dump_bitmap(), Juan Quintela, 2022/01/28
- [PULL 27/36] migration: Do chunk page in postcopy_each_ram_send_discard(), Juan Quintela, 2022/01/28
- [PULL 26/36] migration: Drop postcopy_chunk_hostpages(), Juan Quintela, 2022/01/28
- [PULL 28/36] migration: Drop return code for disgard ram process,
Juan Quintela <=
- [PULL 30/36] migration: Introduce ram_transferred_add(), Juan Quintela, 2022/01/28
- [PULL 29/36] migration: Don't return for postcopy_send_discard_bm_ram(), Juan Quintela, 2022/01/28
- [PULL 31/36] migration: Tally pre-copy, downtime and post-copy bytes independently, Juan Quintela, 2022/01/28
- [PULL 34/36] migration: Add postcopy_has_request(), Juan Quintela, 2022/01/28
- [PULL 32/36] migration: No off-by-one for pss->page update in host page size, Juan Quintela, 2022/01/28
- [PULL 33/36] migration: Enable UFFD_FEATURE_THREAD_ID even without blocktime feat, Juan Quintela, 2022/01/28
- [PULL 36/36] migration: Move temp page setup and cleanup into separate functions, Juan Quintela, 2022/01/28
- [PULL 35/36] migration: Simplify unqueue_page(), Juan Quintela, 2022/01/28
- Re: [PULL 00/36] Migration 20220128 patches, Peter Maydell, 2022/01/30