From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z52VA-0005P1-7o for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:50:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z52V6-0004gq-RA for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:50:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z52V6-0004gT-Eh for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:50:48 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 0ADF38E6F0 for ; Wed, 17 Jun 2015 01:50:48 +0000 (UTC) From: Juan Quintela Date: Wed, 17 Jun 2015 03:50:30 +0200 Message-Id: <1434505833-11234-9-git-send-email-quintela@redhat.com> In-Reply-To: <1434505833-11234-1-git-send-email-quintela@redhat.com> References: <1434505833-11234-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 08/11] migration: Use always helper to set state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com 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 1791185..1c84249 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -545,7 +545,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); } @@ -630,7 +630,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); @@ -723,7 +723,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, #endif } else { error_set(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