From 33a5cb6202f05bf32a870a17c2d9b6d6be6e52f0 Mon Sep 17 00:00:00 2001 From: Wei Yang Date: Thu, 27 Jun 2019 10:08:21 +0800 Subject: [PATCH] migration/postcopy: break the loop when there is no more page to discard When one is equal or bigger then end, it means there is no page to discard. Just break the loop in this case instead of processing it. No functional change, just refactor it a little. Signed-off-by: Wei Yang Message-Id: <20190627020822.15485-3-richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 68bc11c9e7..8a97dadec4 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2864,23 +2864,23 @@ static int postcopy_send_discard_bm_ram(MigrationState *ms, for (current = 0; current < end; ) { unsigned long one = find_next_bit(unsentmap, end, current); + unsigned long zero, discard_length; - if (one < end) { - unsigned long zero = find_next_zero_bit(unsentmap, end, one + 1); - unsigned long discard_length; - - if (zero >= end) { - discard_length = end - one; - } else { - discard_length = zero - one; - } - if (discard_length) { - postcopy_discard_send_range(ms, pds, one, discard_length); - } - current = one + discard_length; - } else { - current = one; + if (one >= end) { + break; } + + zero = find_next_zero_bit(unsentmap, end, one + 1); + + if (zero >= end) { + discard_length = end - one; + } else { + discard_length = zero - one; + } + if (discard_length) { + postcopy_discard_send_range(ms, pds, one, discard_length); + } + current = one + discard_length; } return 0;