From nobody Tue Feb 10 12:45:10 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 1501250108349309.9977393373275; Fri, 28 Jul 2017 06:55:08 -0700 (PDT) Received: from localhost ([::1]:48504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5jO-0003B7-Gm for importer@patchew.org; Fri, 28 Jul 2017 09:55:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5iH-0002OM-Su for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:53:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1db5iD-0000u0-4w for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:53:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57306) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1db5iC-0000t4-UC for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:53:53 -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 76954C047B79; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4013A6F442; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A19AD113864F; Fri, 28 Jul 2017 15:45:52 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 76954C047B79 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 15:45:51 +0200 Message-Id: <1501249552-788-3-git-send-email-armbru@redhat.com> In-Reply-To: <1501249552-788-1-git-send-email-armbru@redhat.com> References: <1501249552-788-1-git-send-email-armbru@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.31]); Fri, 28 Jul 2017 13:45:54 +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] [PATCH 2/3] COLO: Define COLOMode without QAPI 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: zhanghailiang 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" COLOMode is defined in the QAPI schema, but not used there. Of the stuff QAPI generates for it only the typedef is actually used. Use of QAPI is pointless and only complicates things, so don't. Cc: zhanghailiang Signed-off-by: Markus Armbruster --- include/migration/colo.h | 6 ++++++ qapi-schema.json | 16 ---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/include/migration/colo.h b/include/migration/colo.h index ff9874e..5d7c500 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -26,6 +26,12 @@ void migration_incoming_exit_colo(void); void *colo_process_incoming_thread(void *opaque); bool migration_incoming_in_colo_state(void); =20 +typedef enum { + COLO_MODE_UNKNOWN, + COLO_MODE_PRIMARY, + COLO_MODE_SECONDARY, +} COLOMode; + COLOMode get_colo_mode(void); =20 /* failover */ diff --git a/qapi-schema.json b/qapi-schema.json index 9b6f6cb..3f0eb05 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1304,22 +1304,6 @@ 'vmstate-loaded' ] } =20 ## -# @COLOMode: -# -# The colo mode -# -# @unknown: unknown mode -# -# @primary: master side -# -# @secondary: slave side -# -# Since: 2.8 -## -{ 'enum': 'COLOMode', - 'data': [ 'unknown', 'primary', 'secondary'] } - -## # @FailoverStatus: # # An enumeration of COLO failover status --=20 2.7.5