From patchwork Mon Sep 3 04:38:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10585427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F9B313AC for ; Mon, 3 Sep 2018 04:49:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CC8729529 for ; Mon, 3 Sep 2018 04:49:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7009D29533; Mon, 3 Sep 2018 04:49:54 +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 1D7BE29529 for ; Mon, 3 Sep 2018 04:49:54 +0000 (UTC) Received: from localhost ([::1]:43407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwgoD-0001DN-Ag for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Sep 2018 00:49:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwgfx-00007K-5t for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:41:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fwgfw-00057I-Cq for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:41:21 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:38212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fwgfw-00056f-6n for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:41:20 -0400 Received: by mail-pg1-x541.google.com with SMTP id f4-v6so2727088pgq.5 for ; Sun, 02 Sep 2018 21:41:20 -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=zt7NRTIN42jXMPUy8MOSlel/C2qlQ2cbwWEGVrgl+wU=; b=Crbd7woMrPr3ea8u/arW/Ed00blXXGveW2A9c30X9Rb++IAtOsI0I1KeF+eTrPCKxa xPXZtyTlgl5o+v1U3a3dH/mHFCmQ439jT4ACDKAR6DLI9oYIVdvAuywBBYDUufY30ig8 YbGd1wMN4EQwJHJUD/gjbgJ9GWaw5FzUXhgGgdTZwIdyWFfQ0/+oAsmu+pGZyaQJ72Av MEE16K9lC9/bdEUfBny44Euhy4gCmXxpHh/z6/VOjatEiBEZY67BbP0Zh9LabqutI6r1 tskb5DWsOFnTIF9L+fgpbebByoRhzpArvctBIoGOtgvV8cnG2uiay7mq0jCzsB1TTVrH 4Ehg== 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=zt7NRTIN42jXMPUy8MOSlel/C2qlQ2cbwWEGVrgl+wU=; b=YzYINsDg0sJvFegku2s0p1GEQwaE35A2JybgK0t4UPiRNrU4ZG2+72iguXa30ZkwOA q/gyJyUwTKpRniXjqGfKWWP9Yade/DmZdKXXgUh9LC5kfHuh37JaI7v7oS/STwRA86Hq coITFoDFjE3+yEcukvuB5REiXI1ZCjRJ5J4WS4JLEorkvLXdecHPFQKv5qowxpTi5wu7 k69/slDKmZ/FZKA2TAjmuFmB920PNr8cp765tTRgA4rQlWtDjytkc7iU1cKrU0YWMhb/ cjMDZ15gLXEpW6rHgGE0RVbRscVf4FD4e2KqIzBhxMNpWso9Hwt3NbDvk9FOFx3ApsXm 4mow== X-Gm-Message-State: APzg51AiSL2yWFZJkWlIEno37dSSZLU7rNWKMQcJUSbh9y2+E/oMYexF lctO8YVR5s39eDMZxf8X2ME8fMXz X-Google-Smtp-Source: ANB0VdY4/OY2tDfoh7KJ5hwTYY6V00YA9byrMVnmlQ3+iqJU2PZkRuygud+jrWejsav9HO4zuTHxyg== X-Received: by 2002:aa7:8713:: with SMTP id b19-v6mr27555106pfo.151.1535949679040; Sun, 02 Sep 2018 21:41:19 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id g6-v6sm32738308pfb.11.2018.09.02.21.41.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Sep 2018 21:41:18 -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: Mon, 3 Sep 2018 12:38:52 +0800 Message-Id: <20180903043900.28592-12-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180903043900.28592-1-zhangckid@gmail.com> References: <20180903043900.28592-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH V12 11/19] 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 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 761fbb9f78..9107ac124a 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 9b3b1c0c4e..c0bc77fd8d 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -899,18 +899,18 @@ ## # @COLOMode: # -# The colo mode +# The COLO current mode. # -# @unknown: unknown mode +# @none: COLO is disabled. # -# @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: