| Message ID | 20210204171907.901471-5-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | migration: capture error reports into Error object | expand |
On 2/4/21 6:18 PM, Daniel P. Berrangé wrote: > 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/colo.c | 3 +-- > migration/savevm.c | 4 ++-- > migration/savevm.h | 2 +- > 3 files changed, 4 insertions(+), 5 deletions(-) ... > -int qemu_load_device_state(QEMUFile *f) > +int qemu_load_device_state(QEMUFile *f, Error **errp) > { > MigrationIncomingState *mis = migration_incoming_get_current(); > int ret; > @@ -2734,7 +2734,7 @@ int qemu_load_device_state(QEMUFile *f) > /* Load QEMU_VM_SECTION_FULL section */ > ret = qemu_loadvm_state_main(f, mis); > if (ret < 0) { > - error_report("Failed to load device state: %d", ret); > + error_setg(errp, "Failed to load device state: %d", ret); error_setg_errno(), otherwise: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > return ret; > }
diff --git a/migration/colo.c b/migration/colo.c index de27662cab..e344b7cf32 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -748,9 +748,8 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, qemu_mutex_lock_iothread(); vmstate_loading = true; colo_flush_ram_cache(); - ret = qemu_load_device_state(fb); + ret = qemu_load_device_state(fb, errp); if (ret < 0) { - error_setg(errp, "COLO: load device state failed"); vmstate_loading = false; qemu_mutex_unlock_iothread(); return; diff --git a/migration/savevm.c b/migration/savevm.c index f4ed14a230..dd41292d4e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2726,7 +2726,7 @@ int qemu_loadvm_state(QEMUFile *f, Error **errp) return ret; } -int qemu_load_device_state(QEMUFile *f) +int qemu_load_device_state(QEMUFile *f, Error **errp) { MigrationIncomingState *mis = migration_incoming_get_current(); int ret; @@ -2734,7 +2734,7 @@ int qemu_load_device_state(QEMUFile *f) /* Load QEMU_VM_SECTION_FULL section */ ret = qemu_loadvm_state_main(f, mis); if (ret < 0) { - error_report("Failed to load device state: %d", ret); + error_setg(errp, "Failed to load device state: %d", ret); return ret; } diff --git a/migration/savevm.h b/migration/savevm.h index 1069e2dd4f..c727bc103e 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -63,6 +63,6 @@ int qemu_save_device_state(QEMUFile *f); int qemu_loadvm_state(QEMUFile *f, Error **errp); void qemu_loadvm_state_cleanup(void); int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis); -int qemu_load_device_state(QEMUFile *f); +int qemu_load_device_state(QEMUFile *f, Error **errp); #endif
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/colo.c | 3 +-- migration/savevm.c | 4 ++-- migration/savevm.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)