From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Juan Quintela <quintela@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
peterx@redhat.com,
Leonardo Bras Soares Passos <lsoaresp@redhat.com>
Subject: [PATCH 2/7] migration: Don't return for postcopy_chunk_hostpages()
Date: Tue, 7 Dec 2021 19:50:11 +0800 [thread overview]
Message-ID: <20211207115016.73195-3-peterx@redhat.com> (raw)
In-Reply-To: <20211207115016.73195-1-peterx@redhat.com>
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
next prev parent reply other threads:[~2021-12-07 11:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 11:50 [PATCH 0/7] migration: Postcopy cleanup on ram disgard Peter Xu
2021-12-07 11:50 ` [PATCH 1/7] migration: Drop dead code of ram_debug_dump_bitmap() Peter Xu
2021-12-08 16:05 ` Dr. David Alan Gilbert
2022-01-26 21:02 ` Juan Quintela
2021-12-07 11:50 ` Peter Xu [this message]
2021-12-08 16:28 ` [PATCH 2/7] migration: Don't return for postcopy_chunk_hostpages() Dr. David Alan Gilbert
2022-01-26 21:03 ` Juan Quintela
2021-12-07 11:50 ` [PATCH 3/7] migration: Drop postcopy_chunk_hostpages() Peter Xu
2021-12-08 16:55 ` Dr. David Alan Gilbert
2022-01-26 21:14 ` Juan Quintela
2021-12-07 11:50 ` [PATCH 4/7] migration: Do chunk page in postcopy_each_ram_send_discard() Peter Xu
2021-12-08 17:39 ` Dr. David Alan Gilbert
2022-01-26 21:15 ` Juan Quintela
2021-12-07 11:50 ` [PATCH 5/7] migration: Drop return code for disgard ram process Peter Xu
2021-12-08 18:12 ` Dr. David Alan Gilbert
2022-01-26 21:17 ` Juan Quintela
2021-12-07 11:50 ` [PATCH 6/7] migration: Dump sub-cmd name in loadvm_process_command tp Peter Xu
2021-12-08 18:41 ` Dr. David Alan Gilbert
2021-12-09 1:44 ` Peter Xu
2021-12-07 11:50 ` [PATCH 7/7] migration: Finer grained tracepoints for POSTCOPY_LISTEN Peter Xu
2021-12-08 19:46 ` Dr. David Alan Gilbert
2021-12-09 1:54 ` Peter Xu
2021-12-09 9:04 ` Dr. David Alan Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211207115016.73195-3-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lsoaresp@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).