Re: [Qemu-devel] [PATCH 09/12] migration: Use always helper to set state

2015-07-01 Thread Yang Hongyang 



On 07/01/2015 04:51 PM, Juan Quintela wrote:

There were three places that were not using the migrate_set_state()
helper, just fix that.

Signed-off-by: Juan Quintela 


Reviewed-by: Yang Hongyang 


---
  migration/migration.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index c5b778b..a8d2da5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -548,7 +548,7 @@ void migrate_fd_error(MigrationState *s)
  {
  trace_migrate_fd_error();
  assert(s->file == NULL);
-s->state = MIGRATION_STATUS_FAILED;
+migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
  trace_migrate_set_state(MIGRATION_STATUS_FAILED);
  notifier_list_notify(&migration_state_notifiers, s);
  }
@@ -633,7 +633,7 @@ static MigrationState *migrate_init(const MigrationParams 
*params)
  s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
 decompress_thread_count;
  s->bandwidth_limit = bandwidth_limit;
-s->state = MIGRATION_STATUS_SETUP;
+migrate_set_state(s, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);
  trace_migrate_set_state(MIGRATION_STATUS_SETUP);

  s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
@@ -732,7 +732,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
  } else {
  error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
 "a valid migration protocol");
-s->state = MIGRATION_STATUS_FAILED;
+migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
  return;
  }



--
Thanks,
Yang.

Re: [Qemu-devel] [PATCH 09/12] migration: Use always helper to set state

2015-07-01 Thread Dr. David Alan Gilbert 
* Juan Quintela (quint...@redhat.com) wrote:
> There were three places that were not using the migrate_set_state()
> helper, just fix that.
> 
> Signed-off-by: Juan Quintela 

Reviewed-by: Dr. David Alan Gilbert 

> ---
>  migration/migration.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index c5b778b..a8d2da5 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -548,7 +548,7 @@ void migrate_fd_error(MigrationState *s)
>  {
>  trace_migrate_fd_error();
>  assert(s->file == NULL);
> -s->state = MIGRATION_STATUS_FAILED;
> +migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
>  trace_migrate_set_state(MIGRATION_STATUS_FAILED);
>  notifier_list_notify(&migration_state_notifiers, s);
>  }
> @@ -633,7 +633,7 @@ static MigrationState *migrate_init(const MigrationParams 
> *params)
>  s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
> decompress_thread_count;
>  s->bandwidth_limit = bandwidth_limit;
> -s->state = MIGRATION_STATUS_SETUP;
> +migrate_set_state(s, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);
>  trace_migrate_set_state(MIGRATION_STATUS_SETUP);
> 
>  s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
> @@ -732,7 +732,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
>  } else {
>  error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
> "a valid migration protocol");
> -s->state = MIGRATION_STATUS_FAILED;
> +migrate_set_state(s, MIGRATION_STATUS_SETUP, 
> MIGRATION_STATUS_FAILED);
>  return;
>  }
> 
> -- 
> 2.4.3
> 
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK

[Qemu-devel] [PATCH 09/12] migration: Use always helper to set state

2015-07-01 Thread Juan Quintela 
There were three places that were not using the migrate_set_state()
helper, just fix that.

Signed-off-by: Juan Quintela 
---
 migration/migration.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index c5b778b..a8d2da5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -548,7 +548,7 @@ void migrate_fd_error(MigrationState *s)
 {
 trace_migrate_fd_error();
 assert(s->file == NULL);
-s->state = MIGRATION_STATUS_FAILED;
+migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
 trace_migrate_set_state(MIGRATION_STATUS_FAILED);
 notifier_list_notify(&migration_state_notifiers, s);
 }
@@ -633,7 +633,7 @@ static MigrationState *migrate_init(const MigrationParams 
*params)
 s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
decompress_thread_count;
 s->bandwidth_limit = bandwidth_limit;
-s->state = MIGRATION_STATUS_SETUP;
+migrate_set_state(s, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);
 trace_migrate_set_state(MIGRATION_STATUS_SETUP);

 s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
@@ -732,7 +732,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
 } else {
 error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
"a valid migration protocol");
-s->state = MIGRATION_STATUS_FAILED;
+migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
 return;
 }

-- 
2.4.3