diff options
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 12 | ||||
| -rw-r--r-- | migration/savevm.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/migration/migration.c b/migration/migration.c index 7696729340..8b36e7f184 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1577,9 +1577,9 @@ static GSList *migration_blockers; int migrate_add_blocker(Error *reason, Error **errp) { if (migrate_get_current()->only_migratable) { - error_propagate(errp, error_copy(reason)); - error_prepend(errp, "disallowing migration blocker " - "(--only_migratable) for: "); + error_propagate_prepend(errp, error_copy(reason), + "disallowing migration blocker " + "(--only_migratable) for: "); return -EACCES; } @@ -1588,9 +1588,9 @@ int migrate_add_blocker(Error *reason, Error **errp) return 0; } - error_propagate(errp, error_copy(reason)); - error_prepend(errp, "disallowing migration blocker (migration in " - "progress) for: "); + error_propagate_prepend(errp, error_copy(reason), + "disallowing migration blocker " + "(migration in progress) for: "); return -EBUSY; } diff --git a/migration/savevm.c b/migration/savevm.c index e4caff9a6a..9992af4db4 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2453,8 +2453,8 @@ int save_snapshot(const char *name, Error **errp) AioContext *aio_context; if (!replay_can_snapshot()) { - error_report("Record/replay does not allow making snapshot " - "right now. Try once more later."); + error_setg(errp, "Record/replay does not allow making snapshot " + "right now. Try once more later."); return ret; } @@ -2650,8 +2650,8 @@ int load_snapshot(const char *name, Error **errp) MigrationIncomingState *mis = migration_incoming_get_current(); if (!replay_can_snapshot()) { - error_report("Record/replay does not allow loading snapshot " - "right now. Try once more later."); + error_setg(errp, "Record/replay does not allow loading snapshot " + "right now. Try once more later."); return -EINVAL; } |