From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWbnN-0002yB-IP for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:40:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWbnM-0000su-Sj for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:40:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43496) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWbnM-0000sI-MM for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:40:56 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD0EFC0587FD for ; Wed, 3 Jan 2018 05:40:55 +0000 (UTC) From: Peter Xu Date: Wed, 3 Jan 2018 13:40:35 +0800 Message-Id: <20180103054043.25719-4-peterx@redhat.com> In-Reply-To: <20180103054043.25719-1-peterx@redhat.com> References: <20180103054043.25719-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 03/11] migration: remove "enable_colo" var List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com It's only used once, clean it up a bit. Signed-off-by: Peter Xu --- migration/migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index edbda43246..20f7565527 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2177,7 +2177,6 @@ static void *migration_thread(void *opaque) bool entered_postcopy = false; /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */ enum MigrationStatus current_active_state = MIGRATION_STATUS_ACTIVE; - bool enable_colo = migrate_colo_enabled(); rcu_register_thread(); @@ -2305,7 +2304,7 @@ static void *migration_thread(void *opaque) runstate_set(RUN_STATE_POSTMIGRATE); } else { if (s->state == MIGRATION_STATUS_ACTIVE) { - assert(enable_colo); + assert(migrate_colo_enabled()); migrate_start_colo_process(s); /* * Fixme: we will run VM in COLO no matter its old running state. -- 2.14.3