Re: [PATCH v3 1/4] migration: vmstate_save_state_v(): fix error path

[Stefan Berger]

On 10/25/25 4:26 PM, Vladimir Sementsov-Ogievskiy wrote:

In case of pre_save_errp, on error, we continue processing fields,
unlike case of pre_save, where we return immediately. Behavior
for pre_save_errp case is wrong, we must return here, like for
pre_save.

Fixes: 40de712a89
  "migration: Add error-parameterized function variants in VMSD struct"
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>

Reviewed-by: Stefan Berger <stef...@linux.ibm.com>

---
  migration/vmstate.c | 1 +
  1 file changed, 1 insertion(+)

diff --git a/migration/vmstate.c b/migration/vmstate.c
index 81eadde553..fd066f910e 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -443,6 +443,7 @@ int vmstate_save_state_v(QEMUFile *f, const 
VMStateDescription *vmsd,
          if (ret < 0) {
              error_prepend(errp, "pre-save for %s failed, ret: %d: ",
                            vmsd->name, ret);
+            return ret;
          }
      } else if (vmsd->pre_save) {
          ret = vmsd->pre_save(opaque);