[PULL 08/43] migration: factor out vmstate_pre_save() from vmstate_save_state()

[Fabiano Rosas <farosas@suse.de>]

From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

Simplify vmstate_save_state() which is rather big, and simplify further
refactoring.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20260304212303.667141-7-vsementsov@yandex-team.ru
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 migration/vmstate.c | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/migration/vmstate.c b/migration/vmstate.c
index 87e1f04959..605b5c59c7 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -435,32 +435,41 @@ bool vmstate_section_needed(const VMStateDescription *vmsd, void *opaque)
     return true;
 }
 
-static int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
-                                void *opaque, JSONWriter *vmdesc,
-                                int version_id, Error **errp)
+static bool vmstate_pre_save(const VMStateDescription *vmsd, void *opaque,
+                             Error **errp)
 {
     ERRP_GUARD();
-    int ret = 0;
-    const VMStateField *field = vmsd->fields;
-
-    trace_vmstate_save_state_top(vmsd->name);
 
     if (vmsd->pre_save_errp) {
-        ret = vmsd->pre_save_errp(opaque, errp) ? 0 : -EINVAL;
-        if (ret < 0) {
+        if (!vmsd->pre_save_errp(opaque, errp)) {
             error_prepend(errp, "pre-save for %s failed: ", vmsd->name);
-            trace_vmstate_save_state_pre_save_fail(vmsd->name);
-            return ret;
+            return false;
         }
     } else if (vmsd->pre_save) {
-        ret = vmsd->pre_save(opaque);
-        if (ret) {
+        if (vmsd->pre_save(opaque) < 0) {
             error_setg(errp, "pre-save failed: %s", vmsd->name);
-            trace_vmstate_save_state_pre_save_fail(vmsd->name);
-            return ret;
+            return false;
         }
     }
 
+    return true;
+}
+
+static int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
+                                void *opaque, JSONWriter *vmdesc,
+                                int version_id, Error **errp)
+{
+    ERRP_GUARD();
+    int ret = 0;
+    const VMStateField *field = vmsd->fields;
+
+    trace_vmstate_save_state_top(vmsd->name);
+
+    if (!vmstate_pre_save(vmsd, opaque, errp)) {
+        trace_vmstate_save_state_pre_save_fail(vmsd->name);
+        return -EINVAL;
+    }
+
     trace_vmstate_save_state_pre_save_success(vmsd->name);
 
     if (vmdesc) {
-- 
2.51.0