From patchwork Wed Jul 15 10:29:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 495777 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 9A2DC140281 for ; Wed, 15 Jul 2015 20:31:52 +1000 (AEST) Received: from localhost ([::1]:35018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJyg-0000MX-QT for incoming@patchwork.ozlabs.org; Wed, 15 Jul 2015 06:31:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJwh-0004U0-5m for qemu-devel@nongnu.org; Wed, 15 Jul 2015 06:29:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFJwd-0003TC-5J for qemu-devel@nongnu.org; Wed, 15 Jul 2015 06:29:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJwd-0003T5-0U for qemu-devel@nongnu.org; Wed, 15 Jul 2015 06:29:43 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id ACCE619F97D for ; Wed, 15 Jul 2015 10:29:42 +0000 (UTC) Received: from trasno.mitica (ovpn-116-85.ams2.redhat.com [10.36.116.85]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6FATbSj006063; Wed, 15 Jul 2015 06:29:41 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 15 Jul 2015 12:29:33 +0200 Message-Id: <1436956177-17440-3-git-send-email-quintela@redhat.com> In-Reply-To: <1436956177-17440-1-git-send-email-quintela@redhat.com> References: <1436956177-17440-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: amit.shah@redhat.com, dgilbert@redhat.com Subject: [Qemu-devel] [PULL 2/6] migration: Trace event and migration event are different things 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 can want the trace event even without migration events enabled. Reported-by: Wen Congyang Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index ede432e..ba82ff6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -216,7 +216,6 @@ static void migrate_generate_event(int new_state) { if (migrate_use_events()) { qapi_event_send_migration(new_state, &error_abort); - trace_migrate_set_state(new_state); } } @@ -528,6 +527,7 @@ void qmp_migrate_set_parameters(bool has_compress_level, static void migrate_set_state(MigrationState *s, int old_state, int new_state) { if (atomic_cmpxchg(&s->state, old_state, new_state) == old_state) { + trace_migrate_set_state(new_state); migrate_generate_event(new_state); } }