diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-09-05 12:50:22 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-10-23 18:03:43 +0200 |
| commit | 87db1a7d89677e3dbc8b3763e417b9376009bdbb (patch) | |
| tree | 0fd3fcbae6a9c1dfd3f92402ce364e5522b9c7f9 /migration/migration.h | |
| parent | 40a5532f820e26f98d081a49aff9283cd63bd5fa (diff) | |
| download | qemu-87db1a7d89677e3dbc8b3763e417b9376009bdbb.tar.gz | |
migration: Improve migration thread error handling
We now report errors also when we finish migration, not only on info
migrate. We plan to use this error from several places, and we want
the first error to happen to win, so we add an mutex to order it.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/migration.h')
| -rw-r--r-- | migration/migration.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/migration/migration.h b/migration/migration.h index cd988a99b9..8ccdd7a577 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -132,8 +132,12 @@ struct MigrationState int64_t colo_checkpoint_time; QEMUTimer *colo_delay_timer; - /* The last error that occurred */ + /* The first error that has occurred. + We used the mutex to be able to return the 1st error message */ Error *error; + /* mutex to protect errp */ + QemuMutex error_mutex; + /* Do we have to clean up -b/-i from old migrate parameters */ /* This feature is deprecated and will be removed */ bool must_remove_block_options; @@ -162,6 +166,7 @@ bool migration_has_all_channels(void); uint64_t migrate_max_downtime(void); +void migrate_set_error(MigrationState *s, const Error *error); void migrate_fd_error(MigrationState *s, const Error *error); void migrate_fd_connect(MigrationState *s); |