From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Zhang Chen Date: Sun, 3 Jun 2018 13:05:40 +0800 Message-Id: <20180603050546.6827-12-zhangckid@gmail.com> In-Reply-To: <20180603050546.6827-1-zhangckid@gmail.com> References: <20180603050546.6827-1-zhangckid@gmail.com> Subject: [Qemu-devel] [PATCH V8 11/17] qapi: Add new command to query colo status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , Eric Blake , Markus Armbruster Cc: Zhang Chen , zhanghailiang , Li Zhijian 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: # -- 2.17.GIT