From: Peter Xu <peterx@redhat.com>
Date: Sat, 1 Apr 2017 08:18:42 +0000 (+0800)
Subject: migration: set current_active_state once
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=343001f68dd44d3052dea7d4db325aa8a4109b24;p=qemu.git

migration: set current_active_state once

We set it right above this one. No need to set it twice.

CC: Juan Quintela <quintela@redhat.com>
CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/migration.c b/migration/migration.c
index 31e8141c12..dd7f72164c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1941,7 +1941,6 @@ static void *migration_thread(void *opaque)
     qemu_savevm_state_begin(s->to_dst_file, &s->params);
 
     s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
-    current_active_state = MIGRATION_STATUS_ACTIVE;
     migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
                       MIGRATION_STATUS_ACTIVE);