From nobody Sat Feb 7 06:55:51 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500393200076831.6676203826111; Tue, 18 Jul 2017 08:53:20 -0700 (PDT) Received: from localhost ([::1]:57307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXUoI-0003Oe-R8 for importer@patchew.org; Tue, 18 Jul 2017 11:53:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXUdW-0000Cc-Iq for qemu-devel@nongnu.org; Tue, 18 Jul 2017 11:42:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXUdV-0006Ci-Bt for qemu-devel@nongnu.org; Tue, 18 Jul 2017 11:42:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dXUdV-0006C0-2h for qemu-devel@nongnu.org; Tue, 18 Jul 2017 11:42:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 08BC94A70F; Tue, 18 Jul 2017 15:42:08 +0000 (UTC) Received: from secure.mitica (ovpn-117-165.ams2.redhat.com [10.36.117.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CFCE7EF67; Tue, 18 Jul 2017 15:42:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 08BC94A70F Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 08BC94A70F From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 18 Jul 2017 17:41:24 +0200 Message-Id: <20170718154127.6459-14-quintela@redhat.com> In-Reply-To: <20170718154127.6459-1-quintela@redhat.com> References: <20170718154127.6459-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 18 Jul 2017 15:42:08 +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 13/16] migration: remove check against colo support 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, Paolo Bonzini , dgilbert@redhat.com, peterx@redhat.com, Hailiang Zhang 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 Since commit a15215f3 ("build: remove --enable-colo/--disable-colo"), colo is always supported. We don't need any colo_supported() now since it is always true. Removing any extra code that depends on it. CC: Paolo Bonzini CC: Hailiang Zhang Reviewed-by: Juan Quintela Reviewed-by: Zhang Chen Signed-off-by: Peter Xu Message-Id: <1500349150-13240-8-git-send-email-peterx@redhat.com> Signed-off-by: Juan Quintela --- include/migration/colo.h | 1 - migration/colo.c | 5 ----- migration/migration.c | 11 ----------- 3 files changed, 17 deletions(-) diff --git a/include/migration/colo.h b/include/migration/colo.h index be6beba..ff9874e 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -15,7 +15,6 @@ =20 #include "qemu-common.h" =20 -bool colo_supported(void); void colo_info_init(void); =20 void migrate_start_colo_process(MigrationState *s); diff --git a/migration/colo.c b/migration/colo.c index ef35f00..a425543 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -29,11 +29,6 @@ static bool vmstate_loading; =20 #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) =20 -bool colo_supported(void) -{ - return true; -} - bool migration_in_colo_state(void) { MigrationState *s =3D migrate_get_current(); diff --git a/migration/migration.c b/migration/migration.c index c59dad9..915c8cc 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -412,9 +412,6 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabi= lities(Error **errp) continue; } #endif - if (i =3D=3D MIGRATION_CAPABILITY_X_COLO && !colo_supported()) { - continue; - } if (head =3D=3D NULL) { head =3D g_malloc0(sizeof(*caps)); caps =3D head; @@ -613,14 +610,6 @@ void qmp_migrate_set_capabilities(MigrationCapabilityS= tatusList *params, continue; } #endif - if (cap->value->capability =3D=3D MIGRATION_CAPABILITY_X_COLO) { - if (!colo_supported()) { - error_setg(errp, "COLO is not currently supported, please" - " configure with --enable-colo option in orde= r to" - " support COLO feature"); - continue; - } - } s->enabled_capabilities[cap->value->capability] =3D cap->value->st= ate; } =20 --=20 2.9.4