diff options
| author | Ashijeet Acharya | 2017-01-16 12:31:54 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert | 2017-01-24 19:00:31 +0100 |
| commit | b67b8c3a9deacd4e1f029422f01ad8179e16d580 (patch) | |
| tree | 00acedf4c75b608476306d96b1d87d86e4174662 | |
| parent | migration: disallow migrate_add_blocker during migration (diff) | |
| download | qemu-b67b8c3a9deacd4e1f029422f01ad8179e16d580.tar.gz qemu-b67b8c3a9deacd4e1f029422f01ad8179e16d580.tar.xz qemu-b67b8c3a9deacd4e1f029422f01ad8179e16d580.zip | |
migration: Fail migration blocker for --only-migratable
migrate_add_blocker should rightly fail if the '--only-migratable'
option was specified and the device in use should not be able to
perform the action which results in an unmigratable VM.
Make migrate_add_blocker return -EACCES in this case.
Signed-off-by: Ashijeet Acharya <ashijeetacharya@gmail.com>
Message-Id: <1484566314-3987-6-git-send-email-ashijeetacharya@gmail.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
| -rw-r--r-- | include/migration/migration.h | 2 | ||||
| -rw-r--r-- | migration/migration.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index bcbdb0389c..7881e8925b 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -291,7 +291,7 @@ int ram_postcopy_incoming_init(MigrationIncomingState *mis); * * @errp - [out] The reason (if any) we cannot block migration right now. * - * @returns - 0 on success, -EBUSY on failure, with errp set. + * @returns - 0 on success, -EBUSY/-EACCES on failure, with errp set. */ int migrate_add_blocker(Error *reason, Error **errp); diff --git a/migration/migration.c b/migration/migration.c index 0d88286301..7dcb7d7a32 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1113,6 +1113,13 @@ static GSList *migration_blockers; int migrate_add_blocker(Error *reason, Error **errp) { + if (only_migratable) { + error_propagate(errp, error_copy(reason)); + error_prepend(errp, "disallowing migration blocker " + "(--only_migratable) for: "); + return -EACCES; + } + if (migration_is_idle(NULL)) { migration_blockers = g_slist_prepend(migration_blockers, reason); return 0; |