* Amit Shah (amit.s...@redhat.com) wrote:
> On (Thu) 26 Feb 2015 [14:54:41], Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
> >
> > Create a separate error for the case where migrate_incoming is
> > used after a succesful migrate_incoming.
> >
> > Reword the error in the case where '-incoming defer' is missing
> > to omit the command name so it's right for both hmp and qmp.
> >
> > Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> > ---
> > migration/migration.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/migration/migration.c b/migration/migration.c
> > index 2c805f1..e6ac3de 100644
> > --- a/migration/migration.c
> > +++ b/migration/migration.c
> > @@ -435,11 +435,15 @@ void migrate_del_blocker(Error *reason)
> > void qmp_migrate_incoming(const char *uri, Error **errp)
> > {
> > Error *local_err = NULL;
> > + static bool once = true;
> >
> > if (!deferred_incoming) {
> > - error_setg(errp, "'-incoming defer' is required for
> > migrate_incoming");
> > + error_setg(errp, "For use with '-incoming defer'");
> > return;
> > }
> > + if (!once) {
> > + error_setg(errp, "The incoming migration has already been
> > started");
>
> Let me apologise in advance for picking on another error message...
>
> This reads like we already have an incoming migration, when we mean we
> just have a URI for one.
No, if you hit this error you have at least started listening on the connection.
Dave
>
> Amit
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
