| Message ID | 1453875065-24326-1-git-send-email-liang.z.li@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 01/27 14:11, Liang Li wrote: > Since 's->state' will be set in migrate_init(), there is no > need to set it before calling migrate_init(). The code and > the related comments can be removed. Reviewed-by: Fam Zheng <famz@redhat.com> > > Signed-off-by: Liang Li <liang.z.li@intel.com> > --- > migration/migration.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index aaca451..ae38242 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1006,12 +1006,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, > return; > } > > - /* We are starting a new migration, so we want to start in a clean > - state. This change is only needed if previous migration > - failed/was cancelled. We don't use migrate_set_state() because > - we are setting the initial state, not changing it. */ > - s->state = MIGRATION_STATUS_NONE; > - > s = migrate_init(¶ms); > > if (strstart(uri, "tcp:", &p)) { > -- > 1.9.1 > >
* Liang Li (liang.z.li@intel.com) wrote: > Since 's->state' will be set in migrate_init(), there is no > need to set it before calling migrate_init(). The code and > the related comments can be removed. > > Signed-off-by: Liang Li <liang.z.li@intel.com> > --- > migration/migration.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index aaca451..ae38242 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1006,12 +1006,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, > return; > } > > - /* We are starting a new migration, so we want to start in a clean > - state. This change is only needed if previous migration > - failed/was cancelled. We don't use migrate_set_state() because > - we are setting the initial state, not changing it. */ > - s->state = MIGRATION_STATUS_NONE; > - Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > s = migrate_init(¶ms); > > if (strstart(uri, "tcp:", &p)) { > -- > 1.9.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On (Wed) 27 Jan 2016 [14:11:05], Liang Li wrote: > Since 's->state' will be set in migrate_init(), there is no > need to set it before calling migrate_init(). The code and > the related comments can be removed. > > Signed-off-by: Liang Li <liang.z.li@intel.com> > --- > migration/migration.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index aaca451..ae38242 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1006,12 +1006,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, > return; > } > > - /* We are starting a new migration, so we want to start in a clean > - state. This change is only needed if previous migration > - failed/was cancelled. We don't use migrate_set_state() because > - we are setting the initial state, not changing it. */ > - s->state = MIGRATION_STATUS_NONE; > - Looks fine. This was added to ensure a proper init value, but commit 389775d added the init in migrate_init, so this is now redundant. Reviewed-by: Amit Shah <amit.shah@redhat.com> Amit
diff --git a/migration/migration.c b/migration/migration.c index aaca451..ae38242 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1006,12 +1006,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, return; } - /* We are starting a new migration, so we want to start in a clean - state. This change is only needed if previous migration - failed/was cancelled. We don't use migrate_set_state() because - we are setting the initial state, not changing it. */ - s->state = MIGRATION_STATUS_NONE; - s = migrate_init(¶ms); if (strstart(uri, "tcp:", &p)) {
Since 's->state' will be set in migrate_init(), there is no need to set it before calling migrate_init(). The code and the related comments can be removed. Signed-off-by: Liang Li <liang.z.li@intel.com> --- migration/migration.c | 6 ------ 1 file changed, 6 deletions(-)