From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZADkI-0007dj-Is for qemu-devel@nongnu.org; Wed, 01 Jul 2015 04:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZADkH-00082w-O2 for qemu-devel@nongnu.org; Wed, 01 Jul 2015 04:51:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZADkH-00082f-Ik for qemu-devel@nongnu.org; Wed, 01 Jul 2015 04:51:53 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 2EE22359972 for ; Wed, 1 Jul 2015 08:51:53 +0000 (UTC) From: Juan Quintela Date: Wed, 1 Jul 2015 10:51:31 +0200 Message-Id: <1435740693-10839-11-git-send-email-quintela@redhat.com> In-Reply-To: <1435740693-10839-1-git-send-email-quintela@redhat.com> References: <1435740693-10839-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 10/12] migration: No need to call trace_migrate_set_state() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com We now use the helper everywhere, so no need to call this on this two places. See on previous commit that there were a place where we missed to mark the trace. Now all tracing is done in migrate_set_state(). Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index a8d2da5..ef1e4a4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -549,7 +549,6 @@ void migrate_fd_error(MigrationState *s) trace_migrate_fd_error(); assert(s->file == NULL); migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); - trace_migrate_set_state(MIGRATION_STATUS_FAILED); notifier_list_notify(&migration_state_notifiers, s); } @@ -634,7 +633,6 @@ static MigrationState *migrate_init(const MigrationParams *params) decompress_thread_count; s->bandwidth_limit = bandwidth_limit; 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); return s; -- 2.4.3