From patchwork Sun Jun 3 05:05:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10445131 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 453FB603D7 for ; Sun, 3 Jun 2018 05:14:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3692428989 for ; Sun, 3 Jun 2018 05:14:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B337289D4; Sun, 3 Jun 2018 05:14:22 +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 C183428A0A for ; Sun, 3 Jun 2018 05:14:21 +0000 (UTC) Received: from localhost ([::1]:33667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLLR-0005M9-1b for patchwork-qemu-devel@patchwork.kernel.org; Sun, 03 Jun 2018 01:14:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLEG-0000Gq-DE for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPLEF-0000sq-Ge for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:56 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:41226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPLEF-0000sg-9n for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:55 -0400 Received: by mail-pf0-x241.google.com with SMTP id v63-v6so14351979pfk.8 for ; Sat, 02 Jun 2018 22:06:55 -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=R+RoxCRLCgvH4FQH4IMksXdM88TrTlAOFtvilkY1OM0=; b=Pm9C2GACdGmxc+k7IoH45zHVxhwfaUPvsV3Bg2FsF50Gc636i78q4SL7IqLRU8Kqtl U3+qKdCmgD7ZYzyYRqbBTBm0oidNmhVFZjoe/WZl+SwNMKlGPN9vVhcINzo0qzRQOv+w dvLpQhAHFts/3bD8FlYltlHoeefifZLgxiCoEBPOgr/4VFBy/ZJcpRlLI7YBKVZwSZJ9 rIDjjymp2qsML2lxt56lISvjTx5fxbjjmRzu81V+bbU5RexUYL6ppgHfXn4VAXBjmaT0 etnzRLEE2fHAKh+zgiDxan9IpRiq0IcuJEhu7TfYpc4R1IRBF32RNq69FBGMFSqYjveV bWtQ== 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=R+RoxCRLCgvH4FQH4IMksXdM88TrTlAOFtvilkY1OM0=; b=oX0oSQxsE3ddsPx2pcWC9QhiJ7MgjQYfWv8IYvVvtmFt0y+Q02F3kqLnqkKFlGmu/x OK0cL3MpZv1V8YKr2nMvNVG+vMA1tr0arEufQTQAlXIlBIqBYP+bd4w4BJhhvkB5unn9 X52JpqzvYJmXaxCbG+qrQXBq380kiziDL+cBH16j5appDkbk2IB07I0AWhzpSZYkezwb OoOn8Aju/FFGDBThGYkzJakX/XnAe8/GxhekK64/22biU4HzLF6jRKSwVdmil5lzqKqx V5n+cREo407+kWeuTLtlrBrozcUvgmucs4T8ARGfYftOh8W8I5LtJSdNfIBs+AxHY2Nh 2/yg== X-Gm-Message-State: ALKqPwegWbZ3nvR+0QxBAf7HiPOEiVk7OJKVQ3cZL7xQAvCOHp9t0Wob eqet2Ujh+sJuYzEA2bQPeF4YWA== X-Google-Smtp-Source: ADUXVKJXRooR0TEp6vsdIY9EcfEY73NZj4ZUgP7TJahA0c9ZtZBO84JpqiPpPhitP9RFKLOs0h8arQ== X-Received: by 2002:a63:9843:: with SMTP id l3-v6mr13723250pgo.208.1528002414116; Sat, 02 Jun 2018 22:06:54 -0700 (PDT) Received: from localhost.localdomain (197.225.229.35.bc.googleusercontent.com. [35.229.225.197]) by smtp.gmail.com with ESMTPSA id 10-v6sm45841595pgb.40.2018.06.02.22.06.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 22:06:53 -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: Sun, 3 Jun 2018 13:05:40 +0800 Message-Id: <20180603050546.6827-12-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180603050546.6827-1-zhangckid@gmail.com> References: <20180603050546.6827-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH V8 11/17] qapi: Add new command to query colo status 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 , 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 Libvirt or other high level software can use this command query colo status. You can test this command like that: {'execute':'query-colo-status'} Signed-off-by: Zhang Chen --- migration/colo.c | 39 +++++++++++++++++++++++++++++++++++++++ qapi/migration.json | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index bedb677788..8c6b8e9a4e 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -29,6 +29,7 @@ #include "net/colo.h" #include "block/block.h" #include "qapi/qapi-events-migration.h" +#include "qapi/qmp/qerror.h" static bool vmstate_loading; static Notifier packets_compare_notifier; @@ -237,6 +238,44 @@ void qmp_xen_colo_do_checkpoint(Error **errp) #endif } +COLOStatus *qmp_query_colo_status(Error **errp) +{ + int state; + COLOStatus *s = g_new0(COLOStatus, 1); + + s->mode = get_colo_mode(); + + switch (s->mode) { + case COLO_MODE_UNKNOWN: + error_setg(errp, "COLO is disabled"); + state = MIGRATION_STATUS_NONE; + break; + case COLO_MODE_PRIMARY: + state = migrate_get_current()->state; + break; + case COLO_MODE_SECONDARY: + state = migration_incoming_get_current()->state; + break; + default: + abort(); + } + + s->colo_running = state == MIGRATION_STATUS_COLO; + + switch (failover_get_state()) { + case FAILOVER_STATUS_NONE: + s->reason = COLO_EXIT_REASON_NONE; + break; + case FAILOVER_STATUS_REQUIRE: + s->reason = COLO_EXIT_REASON_REQUEST; + break; + default: + s->reason = COLO_EXIT_REASON_ERROR; + } + + return s; +} + static void colo_send_message(QEMUFile *f, COLOMessage msg, Error **errp) { diff --git a/qapi/migration.json b/qapi/migration.json index 93136ce5a0..356a370949 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1231,6 +1231,40 @@ ## { 'command': 'xen-colo-do-checkpoint' } +## +# @COLOStatus: +# +# The result format for 'query-colo-status'. +# +# @mode: COLO running mode. If COLO is running, this field will return +# 'primary' or 'secodary'. +# +# @colo-running: true if COLO is running. +# +# @reason: describes the reason for the COLO exit. +# +# Since: 2.13 +## +{ 'struct': 'COLOStatus', + 'data': { 'mode': 'COLOMode', 'colo-running': 'bool', 'reason': 'COLOExitReason' } } + +## +# @query-colo-status: +# +# Query COLO status while the vm is running. +# +# Returns: A @COLOStatus object showing the status. +# +# Example: +# +# -> { "execute": "query-colo-status" } +# <- { "return": { "mode": "primary", "colo-running": true, "reason": "request" } } +# +# Since: 2.13 +## +{ 'command': 'query-colo-status', + 'returns': 'COLOStatus' } + ## # @migrate-recover: #