From patchwork Sun Jul 22 19:33:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10539385 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 42D141805 for ; Sun, 22 Jul 2018 19:42:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 315612842E for ; Sun, 22 Jul 2018 19:42:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2509D28434; Sun, 22 Jul 2018 19:42:10 +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 BD0A12842E for ; Sun, 22 Jul 2018 19:42:09 +0000 (UTC) Received: from localhost ([::1]:57248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhKF6-0000MM-Vk for patchwork-qemu-devel@patchwork.kernel.org; Sun, 22 Jul 2018 15:42:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhK8P-0002qI-C0 for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhK8O-0000le-E1 for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:35:13 -0400 Received: from mail-pl0-x233.google.com ([2607:f8b0:400e:c01::233]:40801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhK8O-0000lR-7q for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:35:12 -0400 Received: by mail-pl0-x233.google.com with SMTP id s17-v6so7293453plp.7 for ; Sun, 22 Jul 2018 12:35:12 -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=HG3OIejVlOlbbFk1ae3D2HyIIKK9Mr0hXX2S1B5pkdk=; b=Mstx4op5ZDP7bCwKWD/6yGFioMc6d5fUZHMdPPEXNi8MFrNtv6dsKkCYqh1y8WWF/i RPuhL5ktyXRq0FDmVvJVWFs+jKCG18BrmASpeEpwVlWCFkWMU/apgiycWVnBRwEFcD2B ZCMTBhoCYxoQgREpffaB2VPt7sDjTE9kkYrysWthwUOSTSg7/qs8bTnBP/+XWx7GjM05 OTNIOhi7nqWIrcFpjjuJRIfgzOOMkewMYRvCxQoSZAs0W6H1HMqwgyce4oZXiSTilDK5 vuG6JcDbIgbAwwsTKaJOMcrH4v0eTYdMfVrytq+ykiUujo4YmG3eEufsiYZHKkBI48/E MOFQ== 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=HG3OIejVlOlbbFk1ae3D2HyIIKK9Mr0hXX2S1B5pkdk=; b=S0LWUhF1o8pkgCStYi2x3wJzSQV8oeUHnMA7BcshJcJvwTXDm3YwhYalbUA9F0VBIz 3gVU55qtGL/xIy15RtA1zfCelMEwLP/Hz071b0QURKIDBr1VgdyGlKpu7kmJIsVs8l33 E/gKTGTfPrdVc4WUYIdC2ke22IR1uZchvCUPqpg4Ku8OF1m4m9UWbOLoYHKqeJAA2nr2 8gPidBHRcMCU3lKOZjaN+cbJ69BU6zra+Z+9+KSJhpSQ8tB3632Ps8wzgdiypASmyuzd SydB2ayVpOKIx/GGW1OXJfGktfq18UZHizpCPjWQmMFVXXBVdKptumCX9XTAZ/fnl2x6 VARg== X-Gm-Message-State: AOUpUlGY/dWb8YOedpF259lRcwqxFuExMNC4mKoPHod2pizGJFN7p4Iv SEIqpQjAAnyoAyBn8MTXXfvqm68h X-Google-Smtp-Source: AAOMgpdVmq1JeNmJUw6w3m0SIQJe3T2XQRdSHX5yB1m3/oQHuKPzilQgSf8kBWs5v4xksATTnyliOw== X-Received: by 2002:a17:902:ab8e:: with SMTP id f14-v6mr192420plr.5.1532288111021; Sun, 22 Jul 2018 12:35:11 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id 87-v6sm14215353pfn.103.2018.07.22.12.35.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jul 2018 12:35:10 -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, 23 Jul 2018 03:33:41 +0800 Message-Id: <20180722193350.6028-12-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180722193350.6028-1-zhangckid@gmail.com> References: <20180722193350.6028-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::233 Subject: [Qemu-devel] [PATCH V10 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 05f65680e1..cdae7ddccb 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -867,18 +867,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: