From patchwork Fri Jun 12 05:03:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 483369 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 2CC971402B4 for ; Fri, 12 Jun 2015 15:08:30 +1000 (AEST) Received: from localhost ([::1]:49474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3HCe-00049e-5u for incoming@patchwork.ozlabs.org; Fri, 12 Jun 2015 01:08:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3H8S-0004wH-JH for qemu-devel@nongnu.org; Fri, 12 Jun 2015 01:04:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3H8Q-0001ON-9y for qemu-devel@nongnu.org; Fri, 12 Jun 2015 01:04:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3H8Q-0001O4-4V for qemu-devel@nongnu.org; Fri, 12 Jun 2015 01:04:06 -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 C3873C12E0 for ; Fri, 12 Jun 2015 05:04:05 +0000 (UTC) Received: from trasno.mitica (ovpn-116-127.ams2.redhat.com [10.36.116.127]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5C53pa8008114; Fri, 12 Jun 2015 01:04:04 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 12 Jun 2015 07:03:36 +0200 Message-Id: <1434085430-29219-8-git-send-email-quintela@redhat.com> In-Reply-To: <1434085430-29219-1-git-send-email-quintela@redhat.com> References: <1434085430-29219-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 Subject: [Qemu-devel] [PULL 07/21] migration: Remove duplicated assignment of SETUP status 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 assign the MIGRATION_STATUS_SETUP status in two places. Just in succession. Just remove the second one. Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- migration/migration.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 732d229..5d77046 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -838,9 +838,6 @@ static void *migration_thread(void *opaque) void migrate_fd_connect(MigrationState *s) { - s->state = MIGRATION_STATUS_SETUP; - trace_migrate_set_state(MIGRATION_STATUS_SETUP); - /* This is a best 1st approximation. ns to ms */ s->expected_downtime = max_downtime/1000000; s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);