[PULL,38/42] migration: Cleanup qemu_savevm_state_complete_precopy()

Commit Message

Fabiano Rosas Jan. 29, 2025, 4 p.m. UTC

From: Peter Xu <[e-mail]>

Now qemu_savevm_state_complete_precopy() is never used in postcopy, clean
it up as in_postcopy==false now unconditionally.

Signed-off-by: Peter Xu <[e-mail]>
Tested-by: Jiri Denemark <[e-mail]>
Reviewed-by: Juraj Marcin <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
Signed-off-by: Fabiano Rosas <[e-mail]>
---
 migration/savevm.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Patch

diff --git a/migration/savevm.c b/migration/savevm.c
index 0ddc4c8eb5..bc375db282 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1577,25 +1577,19 @@  int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
 int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only)
 {
     int ret;
-    bool in_postcopy = migration_in_postcopy();
 
-    if (!in_postcopy || iterable_only) {
-        ret = qemu_savevm_state_complete_precopy_iterable(f, in_postcopy);
+    ret = qemu_savevm_state_complete_precopy_iterable(f, false);
+    if (ret) {
+        return ret;
+    }
+
+    if (!iterable_only) {
+        ret = qemu_savevm_state_complete_precopy_non_iterable(f, false);
         if (ret) {
             return ret;
         }
     }
 
-    if (iterable_only) {
-        goto flush;
-    }
-
-    ret = qemu_savevm_state_complete_precopy_non_iterable(f, in_postcopy);
-    if (ret) {
-        return ret;
-    }
-
-flush:
     return qemu_fflush(f);
 }