qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: peterx@redhat.com,
	Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
	Fabiano Rosas <farosas@suse.de>,
	Juan Quintela <quintela@redhat.com>,
	Lukas Straub <lukasstraub2@web.de>
Subject: [PATCH 4/7] migration: Deliver return path file error to migrate state too
Date: Wed, 28 Jun 2023 17:49:59 -0400	[thread overview]
Message-ID: <20230628215002.73546-5-peterx@redhat.com> (raw)
In-Reply-To: <20230628215002.73546-1-peterx@redhat.com>

We've already did this for most of the return path thread errors, but not
yet for the IO errors happened on the return path qemufile.  Do that too.

Remember to reset "err" always, because the ownership is not us anymore,
otherwise we're prone to use-after-free later after recovered.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/migration.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/migration/migration.c b/migration/migration.c
index f8c41c4d98..234dd3601d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1992,6 +1992,13 @@ out:
 
     res = qemu_file_get_error(rp);
     if (res) {
+        /* We have forwarded any error in "err" already, reuse "error" */
+        assert(err == NULL);
+        /* Try to deliver this file error to migration state */
+        qemu_file_get_error_obj(rp, &err);
+        migrate_set_error(ms, err);
+        err = NULL;
+
         if (res && migration_in_postcopy()) {
             /*
              * Maybe there is something we can do: it looks like a
-- 
2.41.0



  parent reply	other threads:[~2023-06-28 21:50 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-28 21:49 [PATCH 0/7] migration: Better error handling in return path thread Peter Xu
2023-06-28 21:49 ` [PATCH 1/7] migration: Let migrate_set_error() take ownership Peter Xu
2023-06-28 21:49 ` [PATCH 2/7] migration: Introduce migrate_has_error() Peter Xu
2023-06-28 21:49 ` [PATCH 3/7] migration: Refactor error handling in source return path Peter Xu
2023-06-28 22:51   ` Fabiano Rosas
2023-06-28 21:49 ` Peter Xu [this message]
2023-06-28 22:52   ` [PATCH 4/7] migration: Deliver return path file error to migrate state too Fabiano Rosas
2023-06-28 21:50 ` [PATCH 5/7] migration: Display error in query-migrate irrelevant of status Peter Xu
2023-06-28 23:01   ` Fabiano Rosas
2023-06-29 19:56     ` Peter Xu
2023-06-28 21:50 ` [PATCH 6/7] qemufile: Always return a verbose error Peter Xu
2023-06-28 21:50 ` [PATCH 7/7] migration: Provide explicit error message for file shutdowns Peter Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230628215002.73546-5-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=farosas@suse.de \
    --cc=lsoaresp@redhat.com \
    --cc=lukasstraub2@web.de \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).