From nobody Tue Feb 10 13:16:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516017673607737.0389246851; Mon, 15 Jan 2018 04:01:13 -0800 (PST) Received: from localhost ([::1]:58887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb3Rn-0004zq-NK for importer@patchew.org; Mon, 15 Jan 2018 07:01:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb3L0-0007d6-CT for qemu-devel@nongnu.org; Mon, 15 Jan 2018 06:54:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb3Kz-0003dq-M9 for qemu-devel@nongnu.org; Mon, 15 Jan 2018 06:54:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56588) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb3Kz-0003dS-Gv for qemu-devel@nongnu.org; Mon, 15 Jan 2018 06:54:01 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DF8C7F755 for ; Mon, 15 Jan 2018 11:54:00 +0000 (UTC) Received: from secure.mitica (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A56E50DF9; Mon, 15 Jan 2018 11:53:58 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 12:52:59 +0100 Message-Id: <20180115115309.23982-18-quintela@redhat.com> In-Reply-To: <20180115115309.23982-1-quintela@redhat.com> References: <20180115115309.23982-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 15 Jan 2018 11:54:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 17/27] migration: remove "enable_colo" var X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Xu It's only used once, clean it up a bit. Signed-off-by: Peter Xu Signed-off-by: Juan Quintela --- migration/migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 02d8bc07b1..0b513c2020 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2216,7 +2216,6 @@ static void *migration_thread(void *opaque) bool entered_postcopy =3D false; /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */ enum MigrationStatus current_active_state =3D MIGRATION_STATUS_ACTIVE; - bool enable_colo =3D migrate_colo_enabled(); =20 rcu_register_thread(); =20 @@ -2348,7 +2347,7 @@ static void *migration_thread(void *opaque) * We should really assert here, but since it's during * migration, let's try to reduce the usage of assertions. */ - if (!enable_colo) { + if (!migrate_colo_enabled()) { error_report("%s: critical error: calling COLO code withou= t " "COLO enabled", __func__); } --=20 2.14.3