| Message ID | 1484566314-3987-6-git-send-email-ashijeetacharya@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Ashijeet Acharya (ashijeetacharya@gmail.com) wrote: > 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> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > include/migration/migration.h | 2 +- > migration/migration.c | 7 +++++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index bcbdb03..7881e89 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 0d88286..7dcb7d7 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; > -- > 2.6.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Ashijeet Acharya <ashijeetacharya@gmail.com> wrote: > 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> Reviewed-by: Juan Quintela <quintela@redhat.com>
diff --git a/include/migration/migration.h b/include/migration/migration.h index bcbdb03..7881e89 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 0d88286..7dcb7d7 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;
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> --- include/migration/migration.h | 2 +- migration/migration.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)