From: Arun Menon <armenon@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"David Hildenbrand" <david@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Thomas Huth" <thuth@redhat.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Fam Zheng" <fam@euphon.net>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Peter Xu" <peterx@redhat.com>, "Fabiano Rosas" <farosas@suse.de>,
"Hailiang Zhang" <zhanghailiang@xfusion.com>,
"Steve Sistare" <steven.sistare@oracle.com>,
qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Akihiko Odaki" <odaki@rsg.ci.i.u-tokyo.ac.jp>,
"Dmitry Osipenko" <dmitry.osipenko@collabora.com>,
"Matthew Rosato" <mjrosato@linux.ibm.com>,
"Arun Menon" <armenon@redhat.com>
Subject: [PATCH v4 17/23] migration: push Error **errp into loadvm_postcopy_handle_switchover_start()
Date: Wed, 16 Jul 2025 16:13:07 +0530 [thread overview]
Message-ID: <20250716-propagate_tpm_error-v4-17-7141902077c0@redhat.com> (raw)
In-Reply-To: <20250716-propagate_tpm_error-v4-0-7141902077c0@redhat.com>
This is an incremental step in converting vmstate loading code to report
error via Error objects instead of directly printing it to console/monitor.
It is ensured that loadvm_postcopy_handle_switchover_start() must report
an error in errp, in case of failure.
Signed-off-by: Arun Menon <armenon@redhat.com>
---
migration/savevm.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index a4add82ca0f654bfe7252ae33fe80276f8ee5ffd..2df266129f24d3d0d24ee84c3a8d2f494e50d03f 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2527,7 +2527,7 @@ static int loadvm_process_enable_colo(MigrationIncomingState *mis,
return ret;
}
-static int loadvm_postcopy_handle_switchover_start(void)
+static int loadvm_postcopy_handle_switchover_start(Error **errp)
{
SaveStateEntry *se;
@@ -2540,6 +2540,7 @@ static int loadvm_postcopy_handle_switchover_start(void)
ret = se->ops->switchover_start(se->opaque);
if (ret < 0) {
+ error_setg(errp, "Switchover start failed: %d", ret);
return ret;
}
}
@@ -2650,12 +2651,7 @@ static int loadvm_process_command(QEMUFile *f, Error **errp)
return loadvm_process_enable_colo(mis, errp);
case MIG_CMD_SWITCHOVER_START:
- ret = loadvm_postcopy_handle_switchover_start();
- if (ret < 0) {
- error_setg(errp, "Failed to load device state command: %d", ret);
- return -1;
- }
- return ret;
+ return loadvm_postcopy_handle_switchover_start(errp);
}
return 0;
--
2.50.0
next prev parent reply other threads:[~2025-07-16 10:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 10:42 [PATCH v4 00/23] migration: propagate vTPM errors using Error objects Arun Menon
2025-07-16 10:42 ` [PATCH v4 01/23] migration: push Error **errp into vmstate_subsection_load() Arun Menon
2025-07-16 10:42 ` [PATCH v4 02/23] migration: push Error **errp into vmstate_load_state() Arun Menon
2025-07-16 10:42 ` [PATCH v4 03/23] migration: push Error **errp into qemu_loadvm_state_header() Arun Menon
2025-07-16 10:42 ` [PATCH v4 04/23] migration: push Error **errp into vmstate_load() Arun Menon
2025-07-16 10:42 ` [PATCH v4 05/23] migration: push Error **errp into qemu_loadvm_section_start_full() Arun Menon
2025-07-16 10:42 ` [PATCH v4 06/23] migration: push Error **errp into qemu_loadvm_section_part_end() Arun Menon
2025-07-16 10:42 ` [PATCH v4 07/23] migration: push Error **errp into loadvm_process_command() Arun Menon
2025-07-16 10:42 ` [PATCH v4 08/23] migration: push Error **errp into loadvm_handle_cmd_packaged() Arun Menon
2025-07-16 10:42 ` [PATCH v4 09/23] migration: push Error **errp into ram_postcopy_incoming_init() Arun Menon
2025-07-16 10:43 ` [PATCH v4 10/23] migration: push Error **errp into loadvm_postcopy_handle_advise() Arun Menon
2025-07-16 10:43 ` [PATCH v4 11/23] migration: push Error **errp into loadvm_postcopy_handle_listen() Arun Menon
2025-07-16 10:43 ` [PATCH v4 12/23] migration: push Error **errp into loadvm_postcopy_handle_run() Arun Menon
2025-07-16 10:43 ` [PATCH v4 13/23] migration: push Error **errp into loadvm_postcopy_ram_handle_discard() Arun Menon
2025-07-16 10:43 ` [PATCH v4 14/23] migration: make loadvm_postcopy_handle_resume() void Arun Menon
2025-07-16 10:43 ` [PATCH v4 15/23] migration: push Error **errp into loadvm_handle_recv_bitmap() Arun Menon
2025-07-16 10:43 ` [PATCH v4 16/23] migration: push Error **errp into loadvm_process_enable_colo() Arun Menon
2025-07-16 10:43 ` Arun Menon [this message]
2025-07-16 10:43 ` [PATCH v4 18/23] migration: push Error **errp into qemu_loadvm_state_main() Arun Menon
2025-07-16 10:43 ` [PATCH v4 19/23] migration: push Error **errp into qemu_loadvm_state() Arun Menon
2025-07-16 10:43 ` [PATCH v4 20/23] migration: push Error **errp into qemu_load_device_state() Arun Menon
2025-07-16 10:43 ` [PATCH v4 21/23] migration: Capture error in postcopy_ram_listen_thread() Arun Menon
2025-07-16 10:43 ` [PATCH v4 22/23] migration: Add error-parameterized function variants in VMSD struct Arun Menon
2025-07-16 10:43 ` [PATCH v4 23/23] backends/tpm: Propagate vTPM error on migration failure Arun Menon
2025-07-16 19:58 ` [PATCH v4 00/23] migration: propagate vTPM errors using Error objects Fabiano Rosas
2025-07-16 22:38 ` Arun Menon
2025-07-17 12:30 ` Fabiano Rosas
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=20250716-propagate_tpm_error-v4-17-7141902077c0@redhat.com \
--to=armenon@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=clg@redhat.com \
--cc=cohuck@redhat.com \
--cc=danielhb413@gmail.com \
--cc=david@redhat.com \
--cc=dmitry.osipenko@collabora.com \
--cc=fam@euphon.net \
--cc=farman@linux.ibm.com \
--cc=farosas@suse.de \
--cc=harshpb@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mjrosato@linux.ibm.com \
--cc=mst@redhat.com \
--cc=npiggin@gmail.com \
--cc=odaki@rsg.ci.i.u-tokyo.ac.jp \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=steven.sistare@oracle.com \
--cc=thuth@redhat.com \
--cc=zhanghailiang@xfusion.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).