Hi,
Thanks for the review.
On Mon, Jul 21, 2025 at 09:46:59PM +0900, Akihiko Odaki wrote:
> On 2025/07/21 20:29, Arun Menon wrote:
> > This is an incremental step in converting vmstate loading
> > code to report error via Error objects instead of directly
> > printing it to console/monitor.
> >
> > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
> > Signed-off-by: Arun Menon <arme...@redhat.com>
> > ---
> > migration/savevm.c | 16 +++++-----------
> > 1 file changed, 5 insertions(+), 11 deletions(-)
> >
> > diff --git a/migration/savevm.c b/migration/savevm.c
> > index
> > e472f79d5d5c4fb4410a28cbf43c298be028f4b4..6887877f2f8648f66e34bdb1cc3ca6dc7514f9df
> > 100644
> > --- a/migration/savevm.c
> > +++ b/migration/savevm.c
> > @@ -2339,12 +2339,12 @@ static void
> > migrate_send_rp_req_pages_pending(MigrationIncomingState *mis)
> > }
> > }
> > -static int loadvm_postcopy_handle_resume(MigrationIncomingState *mis)
> > +static void loadvm_postcopy_handle_resume(MigrationIncomingState *mis)
> > {
> > if (mis->state != MIGRATION_STATUS_POSTCOPY_RECOVER) {
> > - error_report("%s: illegal resume received", __func__);
> > + warn_report("%s: illegal resume received", __func__);
> > /* Don't fail the load, only for this. */
> > - return 0;
> > + return;
> > }
> > /*
> > @@ -2396,8 +2396,6 @@ static int
> > loadvm_postcopy_handle_resume(MigrationIncomingState *mis)
> > /* Kick the fast ram load thread too */
> > qemu_sem_post(&mis->postcopy_pause_sem_fast_load);
> > }
> > -
> > - return 0;
> > }
> > /**
> > @@ -2635,12 +2633,8 @@ static int loadvm_process_command(QEMUFile *f, Error
> > **errp)
> > return loadvm_postcopy_ram_handle_discard(mis, len, errp);
> > case MIG_CMD_POSTCOPY_RESUME:
> > - ret = loadvm_postcopy_handle_resume(mis);
> > - if (ret < 0) {
> > - error_setg(errp, "Failed to load device state command: %d",
> > ret);
> > - return -1;
> > - }
> > - return ret;
> > + loadvm_postcopy_handle_resume(mis);
> > + return 0;
>
> This patch can be moved before "[PATCH v6 08/24] migration: push Error
> **errp into loadvm_process_command()" to make it smaller.
Agreed. Will do.
>
> > case MIG_CMD_RECV_BITMAP:
> > ret = loadvm_handle_recv_bitmap(mis, len);
> >
>
Regards,
Arun
