| Message ID | 1532434585-14732-2-git-send-email-lidongchen@tencent.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] migration: fix the Unknown ending state error log | expand |
On Tue, Jul 24, 2018 at 08:16:25PM +0800, Lidong Chen wrote: > migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh. > > Signed-off-by: Lidong Chen <lidongchen@tencent.com> This seems correct to me. Reviewed-by: Peter Xu <peterx@redhat.com> > --- > migration/migration.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index ff05422..b8c4fec 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in) > } else { > /* This is a fresh new migration */ > rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO; > - s->expected_downtime = s->parameters.downtime_limit; > - s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s); > > /* Notify before starting migration thread */ > notifier_list_notify(&migration_state_notifiers, s); > -- > 1.8.3.1 > > Regards,
Lidong Chen <jemmy858585@gmail.com> wrote: > migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh. > > Signed-off-by: Lidong Chen <lidongchen@tencent.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Good catch. Inserted here. commit d3e35b8f6248eab2c3d412198a487ae49706b214 Author: Peter Xu <peterx@redhat.com> Date: Wed May 2 18:47:24 2018 +0800 > --- > migration/migration.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index ff05422..b8c4fec 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in) > } else { > /* This is a fresh new migration */ > rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO; > - s->expected_downtime = s->parameters.downtime_limit; > - s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s); > > /* Notify before starting migration thread */ > notifier_list_notify(&migration_state_notifiers, s);
* Lidong Chen (jemmy858585@gmail.com) wrote: > migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh. Queued (just 2/2) > Signed-off-by: Lidong Chen <lidongchen@tencent.com> > --- > migration/migration.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index ff05422..b8c4fec 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in) > } else { > /* This is a fresh new migration */ > rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO; > - s->expected_downtime = s->parameters.downtime_limit; > - s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s); > > /* Notify before starting migration thread */ > notifier_list_notify(&migration_state_notifiers, s); > -- > 1.8.3.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/migration.c b/migration/migration.c index ff05422..b8c4fec 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3032,8 +3032,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in) } else { /* This is a fresh new migration */ rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO; - s->expected_downtime = s->parameters.downtime_limit; - s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s); /* Notify before starting migration thread */ notifier_list_notify(&migration_state_notifiers, s);
migrate_fd_connect duplicate initialize expected_downtime and cleanup_bh. Signed-off-by: Lidong Chen <lidongchen@tencent.com> --- migration/migration.c | 2 -- 1 file changed, 2 deletions(-)