qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Xu" <peterx@redhat.com>, "Fabiano Rosas" <farosas@suse.de>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Avihai Horon" <avihaih@nvidia.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Cédric Le Goater" <clg@redhat.com>
Subject: [PATCH v3 10/26] migration: Move cleanup after after error reporting in qemu_savevm_state_setup()
Date: Mon,  4 Mar 2024 13:28:28 +0100	[thread overview]
Message-ID: <20240304122844.1888308-11-clg@redhat.com> (raw)
In-Reply-To: <20240304122844.1888308-1-clg@redhat.com>

This will help preserving the error set by .save_setup() handlers.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 migration/savevm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/savevm.c b/migration/savevm.c
index 31ce9391d49c825d4ec835e26ac0246e192783a0..e400706e61e06d2d1d03a11aed14f30a243833f2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1740,10 +1740,10 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
         qemu_savevm_state_complete_precopy(f, false, false);
         ret = qemu_file_get_error(f);
     }
-    qemu_savevm_state_cleanup();
     if (ret != 0) {
         error_setg_errno(errp, -ret, "Error while writing VM state");
     }
+    qemu_savevm_state_cleanup();
 
     if (ret != 0) {
         status = MIGRATION_STATUS_FAILED;
-- 
2.44.0



  parent reply	other threads:[~2024-03-04 12:35 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-04 12:28 [PATCH v3 00/26] migration: Improve error reporting Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 01/26] s390/stattrib: Add Error** argument to set_migrationmode() handler Cédric Le Goater
2024-03-04 20:49   ` Fabiano Rosas
2024-03-05  7:12     ` Cédric Le Goater
2024-03-05 14:54   ` Avihai Horon
2024-03-04 12:28 ` [PATCH v3 02/26] vfio: Always report an error in vfio_save_setup() Cédric Le Goater
2024-03-04 20:51   ` Fabiano Rosas
2024-03-06  9:56   ` Avihai Horon
2024-03-06 10:16     ` Avihai Horon
2024-03-06 10:51       ` Cédric Le Goater
2024-03-06 10:49     ` Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 03/26] migration: Always report an error in block_save_setup() Cédric Le Goater
2024-03-04 21:04   ` Fabiano Rosas
2024-03-05  8:23     ` Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 04/26] migration: Always report an error in ram_save_setup() Cédric Le Goater
2024-03-04 21:30   ` Fabiano Rosas
2024-03-05  8:52     ` Cédric Le Goater
2024-03-05  5:29   ` Prasad Pandit
2024-03-05  8:53     ` Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 05/26] migration: Add Error** argument to vmstate_save() Cédric Le Goater
2024-03-05  7:44   ` Prasad Pandit
2024-03-04 12:28 ` [PATCH v3 06/26] migration: Report error when shutdown fails Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 07/26] migration: Remove SaveStateHandler and LoadStateHandler typedefs Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 08/26] migration: Add documentation for SaveVMHandlers Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 09/26] migration: Do not call PRECOPY_NOTIFY_SETUP notifiers in case of error Cédric Le Goater
2024-03-04 12:28 ` Cédric Le Goater [this message]
2024-03-05  3:32   ` [PATCH v3 10/26] migration: Move cleanup after after error reporting in qemu_savevm_state_setup() Peter Xu
2024-03-05  7:57     ` Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 11/26] migration: Add Error** argument to qemu_savevm_state_setup() Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 12/26] migration: Add Error** argument to .save_setup() handler Cédric Le Goater
2024-03-05  8:54   ` Thomas Huth
2024-03-04 12:28 ` [PATCH v3 13/26] migration: Add Error** argument to .load_setup() handler Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 14/26] memory: Add Error** argument to .log_global*() handlers Cédric Le Goater
2024-03-05  7:57   ` Peter Xu
2024-03-05 14:25     ` Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 15/26] memory: Add Error** argument to the global_dirty_log routines Cédric Le Goater
2024-03-05  1:58   ` Yong Huang
2024-03-04 12:28 ` [PATCH v3 16/26] migration: Modify ram_init_bitmaps() to report dirty tracking errors Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 17/26] vfio: Add Error** argument to .set_dirty_page_tracking() handler Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 18/26] vfio: Add Error** argument to vfio_devices_dma_logging_start() Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 19/26] vfio: Add Error** argument to vfio_devices_dma_logging_stop() Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 20/26] vfio: Use new Error** argument in vfio_save_setup() Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 21/26] vfio: Add Error** argument to .vfio_save_config() handler Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 22/26] vfio: Reverse test on vfio_get_dirty_bitmap() Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 23/26] memory: Add Error** argument to memory_get_xlat_addr() Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 24/26] vfio: Add Error** argument to .get_dirty_bitmap() handler Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 25/26] vfio: Also trace event failures in vfio_save_complete_precopy() Cédric Le Goater
2024-03-04 12:28 ` [PATCH v3 26/26] vfio: Extend vfio_set_migration_error() with Error* argument Cédric Le Goater
2024-03-05  8:06 ` [PATCH v3 00/26] migration: Improve error reporting Peter Xu
2024-03-05  8:30   ` Cédric Le Goater

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=20240304122844.1888308-11-clg@redhat.com \
    --to=clg@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=avihaih@nvidia.com \
    --cc=farosas@suse.de \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).