From patchwork Wed Jun 27 20:41:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10492643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BDB32601A0 for ; Wed, 27 Jun 2018 20:51:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C26A52018F for ; Wed, 27 Jun 2018 20:51:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4A8428EB2; Wed, 27 Jun 2018 20:51:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C98228D21 for ; Wed, 27 Jun 2018 20:51:41 +0000 (UTC) Received: from localhost ([::1]:33142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYHPg-0002fH-D3 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Jun 2018 16:51:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYHH5-0004AB-Dz for qemu-devel@nongnu.org; Wed, 27 Jun 2018 16:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYHH4-0006V1-AV for qemu-devel@nongnu.org; Wed, 27 Jun 2018 16:42:47 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:36365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYHH4-0006UE-3e for qemu-devel@nongnu.org; Wed, 27 Jun 2018 16:42:46 -0400 Received: by mail-pg0-x244.google.com with SMTP id m5-v6so1430318pgd.3 for ; Wed, 27 Jun 2018 13:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lV3MMVg+nxJIUYS6pgww3wyyUK7k1YWd2JYqafC9seY=; b=MakkX+cUIcwpk9fs9ug0dPbtK8gboV5N2g59DJ7NrxbZ5QHrRb+4VJM3Pyvc6a7G5l DPLk8L21XeZ3QnvUDPefXlOwFbBQmaHFw/NMazvGC8S+uBfRvoB/e11UhuCbiD7d036g HmEIlm3mPNLLw0u94KkuQev5IxWhSq9zOwdhBYzqOidrXe6oQAw2IDUoWa/yV62hknnC Jg8Yl4pHHnykB79b3sUQ3NmyYzdG/rjQ5NSGPIz2/zjk2H6wNQziiXix65UipYKJcwaO XcZ3dvFz7bhoep8FUEmXUc8cD/nLRZ2LV2M7+FSLg1EMI9lVgE2wFRU3mf8dURRwUbul JTPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lV3MMVg+nxJIUYS6pgww3wyyUK7k1YWd2JYqafC9seY=; b=Bbtktye3929jyufqwlEz67z8Lmf4M0X+hdpJ0Fwr2IZiFAWa6MNdzdNfmQzm2eIZ04 04KRvsAwxOIm9RTg11bAtPrV+IpDYNDysbXPs6yES8DfJxlDGDIA0G2rtB3vl+CChamg yvxzbmjGbOgzFCZdU6Jw2GgYO5bXXTzJzggCPuZjajQ8CWnYPQiZzsUrXkanYbsr3VEC Ye8XTS0C5/B2zGu84mK2SpGZ2x3+BncootRLmpbNMQwVk/zbF+hkaBz1w1pu4aeQu9CK 5Q26UkklFGlMjrBFuJ0QHZ4EHr4E9ZddFoRKq54AS7jfdqW4E2qcssL+muycPnEBfUYi Q0zw== X-Gm-Message-State: APt69E18YCXYnwF0RpYVzdaNjD07xu1MOeDyLmwA8GsOsIKhj/DlsITK 2pi63uLdUIv+7QDUHen6IpmReQ== X-Google-Smtp-Source: AAOMgpe/axD+ZuvS/ka4hYvFQSorK7DChxZZHWKwgaYzZf1gjoiXsiKcMmnmKwSvelvaKzduFR/WOQ== X-Received: by 2002:a62:170c:: with SMTP id 12-v6mr7311338pfx.139.1530132164883; Wed, 27 Jun 2018 13:42:44 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id c67-v6sm9690428pfj.173.2018.06.27.13.42.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 13:42:43 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , Eric Blake , Markus Armbruster Date: Thu, 28 Jun 2018 04:41:27 +0800 Message-Id: <20180627204136.4177-12-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180627204136.4177-1-zhangckid@gmail.com> References: <20180627204136.4177-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PATCH V9 11/20] qapi/migration.json: Rename COLO unknown mode to none mode. 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: Zhang Chen , zhanghailiang , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Zhang Chen Suggested by Markus Armbruster rename COLO unknown mode to none mode. Signed-off-by: Zhang Chen Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- migration/colo-failover.c | 2 +- migration/colo.c | 2 +- qapi/migration.json | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/migration/colo-failover.c b/migration/colo-failover.c index 0ae0c41221..4854a96c92 100644 --- a/migration/colo-failover.c +++ b/migration/colo-failover.c @@ -77,7 +77,7 @@ FailoverStatus failover_get_state(void) void qmp_x_colo_lost_heartbeat(Error **errp) { - if (get_colo_mode() == COLO_MODE_UNKNOWN) { + if (get_colo_mode() == COLO_MODE_NONE) { error_setg(errp, QERR_FEATURE_DISABLED, "colo"); return; } diff --git a/migration/colo.c b/migration/colo.c index ab484ad754..8fdb79ac73 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -160,7 +160,7 @@ COLOMode get_colo_mode(void) } else if (migration_incoming_in_colo_state()) { return COLO_MODE_SECONDARY; } else { - return COLO_MODE_UNKNOWN; + return COLO_MODE_NONE; } } diff --git a/qapi/migration.json b/qapi/migration.json index d8c3b2e443..c24f114104 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -864,18 +864,18 @@ ## # @COLOMode: # -# The colo mode +# The COLO current mode. # -# @unknown: unknown mode +# @none: None mode. # -# @primary: master side +# @primary: COLO node in primary side. # -# @secondary: slave side +# @secondary: COLO node in slave side. # # Since: 2.8 ## { 'enum': 'COLOMode', - 'data': [ 'unknown', 'primary', 'secondary'] } + 'data': [ 'none', 'primary', 'secondary'] } ## # @FailoverStatus: