qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Juan Quintela" <quintela@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Hailiang Zhang" <zhang.zhanghailiang@huawei.com>
Subject: [PATCH 25/33] migration: push Error **errp into qemu_savevm_state_complete_precopy()
Date: Thu,  4 Feb 2021 17:18:59 +0000	[thread overview]
Message-ID: <20210204171907.901471-26-berrange@redhat.com> (raw)
In-Reply-To: <20210204171907.901471-1-berrange@redhat.com>

This is an incremental step in converting vmstate loading code to report
via Error objects instead of printing directly to the console/monitor.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 migration/savevm.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/migration/savevm.c b/migration/savevm.c
index 318ba547bc..3b46fbba32 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1329,7 +1329,8 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f)
 }
 
 static
-int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy)
+int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy,
+                                                Error **errp)
 {
     SaveStateEntry *se;
     int ret;
@@ -1355,6 +1356,8 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy)
         trace_savevm_section_end(se->idstr, se->section_id, ret);
         save_section_footer(f, se);
         if (ret < 0) {
+            error_setg_errno(errp, -ret,
+                             "failed to complete precopy device state save");
             qemu_file_set_error(f, ret);
             return -1;
         }
@@ -1450,9 +1453,10 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only,
     cpu_synchronize_all_states();
 
     if (!in_postcopy || iterable_only) {
-        ret = qemu_savevm_state_complete_precopy_iterable(f, in_postcopy);
-        if (ret) {
-            return ret;
+        if (qemu_savevm_state_complete_precopy_iterable(f, in_postcopy,
+                                                        &local_err) < 0) {
+            error_report_err(local_err);
+            return -1;
         }
     }
 
-- 
2.29.2



  parent reply	other threads:[~2021-02-04 18:07 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-04 17:18 [PATCH 00/33] migration: capture error reports into Error object Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 01/33] migration: push Error **errp into qemu_loadvm_state() Daniel P. Berrangé
2021-02-04 21:57   ` Philippe Mathieu-Daudé
2021-02-05  9:33     ` Daniel P. Berrangé
2021-02-05  9:35       ` Philippe Mathieu-Daudé
2021-03-11 12:38         ` Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 02/33] migration: push Error **errp into qemu_loadvm_state_header() Daniel P. Berrangé
2021-02-04 21:58   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 03/33] migration: push Error **errp into qemu_loadvm_state_setup() Daniel P. Berrangé
2021-02-04 21:59   ` Philippe Mathieu-Daudé
2021-02-05  7:50   ` Markus Armbruster
2021-02-04 17:18 ` [PATCH 04/33] migration: push Error **errp into qemu_load_device_state() Daniel P. Berrangé
2021-02-04 22:01   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 05/33] migration: push Error **errp into qemu_loadvm_state_main() Daniel P. Berrangé
2021-02-15 18:35   ` Dr. David Alan Gilbert
2021-02-15 18:58     ` Daniel P. Berrangé
2021-03-11 12:17     ` Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 06/33] migration: push Error **errp into qemu_loadvm_section_start_full() Daniel P. Berrangé
2021-02-04 22:04   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 07/33] migration: push Error **errp into qemu_loadvm_section_part_end() Daniel P. Berrangé
2021-02-05 16:16   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 08/33] migration: push Error **errp into loadvm_process_command() Daniel P. Berrangé
2021-02-05 16:18   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 09/33] migration: push Error **errp into loadvm_handle_cmd_packaged() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 10/33] migration: push Error **errp into loadvm_postcopy_handle_advise() Daniel P. Berrangé
2021-02-05 16:21   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 11/33] migration: push Error **errp into ram_postcopy_incoming_init() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 12/33] migration: push Error **errp into loadvm_postcopy_handle_listen() Daniel P. Berrangé
2021-02-05 16:23   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 13/33] migration: push Error **errp into loadvm_postcopy_handle_run() Daniel P. Berrangé
2021-02-05 16:23   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 14/33] migration: push Error **errp into loadvm_postcopy_ram_handle_discard() Daniel P. Berrangé
2021-02-05 16:24   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 15/33] migration: make loadvm_postcopy_handle_resume() void Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 16/33] migration: push Error **errp into loadvm_handle_recv_bitmap() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 17/33] migration: push Error **errp into loadvm_process_enable_colo() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 18/33] migration: push Error **errp into colo_init_ram_cache() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 19/33] migration: push Error **errp into check_section_footer() Daniel P. Berrangé
2021-02-05 16:26   ` Philippe Mathieu-Daudé
2021-02-04 17:18 ` [PATCH 20/33] migration: push Error **errp into global_state_store() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 21/33] migration: remove error reporting from qemu_fopen_bdrv() callers Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 22/33] migration: push Error **errp into qemu_savevm_state_iterate() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 23/33] migration: simplify some error reporting in save_snapshot() Daniel P. Berrangé
2021-02-04 17:18 ` [PATCH 24/33] migration: push Error **errp into qemu_savevm_state_setup() Daniel P. Berrangé
2021-02-04 17:18 ` Daniel P. Berrangé [this message]
2021-02-04 17:19 ` [PATCH 26/33] migration: push Error **errp into qemu_savevm_state_complete_precopy_non_iterable() Daniel P. Berrangé
2021-02-04 17:19 ` [PATCH 27/33] migration: push Error **errp into qemu_savevm_state_complete_precopy() Daniel P. Berrangé
2021-02-04 17:19 ` [PATCH 28/33] migration: push Error **errp into qemu_savevm_send_packaged() Daniel P. Berrangé
2021-02-04 17:19 ` [PATCH 29/33] migration: push Error **errp into qemu_savevm_live_state() Daniel P. Berrangé
2021-02-04 17:19 ` [PATCH 30/33] migration: push Error **errp into qemu_save_device_state() Daniel P. Berrangé
2021-02-04 17:19 ` [PATCH 31/33] migration: push Error **errp into qemu_savevm_state_resume_prepare() Daniel P. Berrangé
2021-02-04 17:19 ` [PATCH 32/33] migration: push Error **errp into postcopy_resume_handshake() Daniel P. Berrangé
2021-02-04 17:19 ` [PATCH 33/33] migration: push Error **errp into postcopy_do_resume() Daniel P. Berrangé
2021-02-04 18:22 ` [PATCH 00/33] migration: capture error reports into Error object Dr. David Alan Gilbert
2021-02-04 19:09   ` Daniel P. Berrangé
2021-02-08 13:29     ` Dr. David Alan Gilbert
2021-02-08 13:42       ` Daniel P. Berrangé
2021-02-08 14:29         ` Dr. David Alan Gilbert
2021-02-08 14:36           ` Daniel P. Berrangé
2021-02-15 18:38         ` Dr. David Alan Gilbert
2021-02-15 18:58           ` Daniel P. Berrangé
2021-02-15 19:01             ` Dr. David Alan Gilbert
2021-02-16  9:30               ` Daniel P. Berrangé
2021-02-16 19:32                 ` Dr. David Alan Gilbert

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=20210204171907.901471-26-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=zhang.zhanghailiang@huawei.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).