From patchwork Thu Jul 2 16:10:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 490745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 862C014028E for ; Fri, 3 Jul 2015 02:27:07 +1000 (AEST) Received: from localhost ([::1]:37661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAhKL-0008KM-Mn for incoming@patchwork.ozlabs.org; Thu, 02 Jul 2015 12:27:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAh4k-0005ci-BF for qemu-devel@nongnu.org; Thu, 02 Jul 2015 12:10:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAh4d-00066a-9n for qemu-devel@nongnu.org; Thu, 02 Jul 2015 12:10:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAh4d-00066E-4V for qemu-devel@nongnu.org; Thu, 02 Jul 2015 12:10:51 -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 C9EEEAB98F for ; Thu, 2 Jul 2015 16:10:50 +0000 (UTC) Received: from trasno.mitica (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t62GAFG7011910; Thu, 2 Jul 2015 12:10:49 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 2 Jul 2015 18:10:10 +0200 Message-Id: <1435853415-23545-23-git-send-email-quintela@redhat.com> In-Reply-To: <1435853415-23545-1-git-send-email-quintela@redhat.com> References: <1435853415-23545-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: amit.shah@redhat.com Subject: [Qemu-devel] [PULL 22/27] migration: No need to call trace_migrate_set_state() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 78eb715..ffaa5c8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -550,7 +550,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); } @@ -635,7 +634,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;