From: Peter Xu <peterx@redhat.com>
Date: Fri, 13 Jun 2025 14:07:58 +0000 (-0400)
Subject: migration/ram: One less indent for ram_find_and_save_block()
X-Git-Tag: v10.1.0-rc0~25^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff9dfc41d9e74651d565a3cad80dbaac3cde1eb9;p=thirdparty%2Fqemu.git

migration/ram: One less indent for ram_find_and_save_block()

The check over PAGE_DIRTY_FOUND isn't necessary. We could indent one less
and assert that instead.

Reviewed-by: Juraj Marcin <jmarcin@redhat.com>
Link: https://lore.kernel.org/r/20250613140801.474264-9-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---

diff --git a/migration/ram.c b/migration/ram.c
index ffd839f57c..aa76f0a53f 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2286,16 +2286,18 @@ static int ram_find_and_save_block(RAMState *rs)
         if (!get_queued_page(rs, pss)) {
             /* priority queue empty, so just search for something dirty */
             int res = find_dirty_block(rs, pss);
-            if (res != PAGE_DIRTY_FOUND) {
-                if (res == PAGE_ALL_CLEAN) {
-                    break;
-                } else if (res == PAGE_TRY_AGAIN) {
-                    continue;
-                } else if (res < 0) {
-                    pages = res;
-                    break;
-                }
+
+            if (res == PAGE_ALL_CLEAN) {
+                break;
+            } else if (res == PAGE_TRY_AGAIN) {
+                continue;
+            } else if (res < 0) {
+                pages = res;
+                break;
             }
+
+            /* Otherwise we must have a dirty page to move */
+            assert(res == PAGE_DIRTY_FOUND);
         }
         pages = ram_save_host_page(rs, pss);
         if (pages) {