From: Fabiano Rosas <farosas@suse.de>
Date: Thu, 4 Jan 2024 14:21:41 +0000 (-0300)
Subject: migration: Report error in incoming migration
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e3b8ad5c13714cca5e3fc1445472171fbcd469bc;p=qemu.git

migration: Report error in incoming migration

We're not currently reporting the errors set with migrate_set_error()
when incoming migration fails.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/20240104142144.9680-5-farosas@suse.de
Signed-off-by: Peter Xu <peterx@redhat.com>
---

diff --git a/migration/migration.c b/migration/migration.c
index 2365a3a13c..219447dea1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -697,6 +697,13 @@ process_incoming_migration_co(void *opaque)
     }
 
     if (ret < 0) {
+        MigrationState *s = migrate_get_current();
+
+        if (migrate_has_error(s)) {
+            WITH_QEMU_LOCK_GUARD(&s->error_mutex) {
+                error_report_err(s->error);
+            }
+        }
         error_report("load of migration failed: %s", strerror(-ret));
         goto fail;
     }