From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Zhang Chen <zhangckid@gmail.com>,
Zhang Chen <chen.zhang@intel.com>,
Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL V2 12/26] qapi: Add new command to query colo status
Date: Fri, 19 Oct 2018 11:22:11 +0800 [thread overview]
Message-ID: <1539919345-10703-13-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1539919345-10703-1-git-send-email-jasowang@redhat.com>
From: Zhang Chen <zhangckid@gmail.com>
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 <zhangckid@gmail.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
migration/colo.c | 21 +++++++++++++++++++++
qapi/migration.json | 32 ++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/migration/colo.c b/migration/colo.c
index 2cdd366..94c4e09 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,26 @@ void qmp_xen_colo_do_checkpoint(Error **errp)
#endif
}
+COLOStatus *qmp_query_colo_status(Error **errp)
+{
+ COLOStatus *s = g_new0(COLOStatus, 1);
+
+ s->mode = get_colo_mode();
+
+ 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 0776e0f..0928f4b 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1308,6 +1308,38 @@
{ '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 'secondary'.
+#
+# @reason: describes the reason for the COLO exit.
+#
+# Since: 3.0
+##
+{ 'struct': 'COLOStatus',
+ 'data': { 'mode': 'COLOMode', '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", "active": true, "reason": "request" } }
+#
+# Since: 3.0
+##
+{ 'command': 'query-colo-status',
+ 'returns': 'COLOStatus' }
+
+##
# @migrate-recover:
#
# Provide a recovery migration stream URI.
--
2.5.0
next prev parent reply other threads:[~2018-10-19 3:23 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 3:21 [Qemu-devel] [PULL V2 00/26] Net patches Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table Jason Wang
2018-10-29 11:01 ` Peter Maydell
2018-10-30 2:02 ` Jason Wang
2018-10-30 2:29 ` Zhang Chen
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 02/26] colo-compare: implement the process of checkpoint Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 03/26] colo-compare: use notifier to notify packets comparing result Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 04/26] COLO: integrate colo compare with colo frame Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 05/26] COLO: Add block replication into colo process Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 06/26] COLO: Remove colo_state migration struct Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 07/26] COLO: Load dirty pages into SVM's RAM cache firstly Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 08/26] ram/COLO: Record the dirty pages that SVM received Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 09/26] COLO: Flush memory data from ram cache Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 10/26] qmp event: Add COLO_EXIT event to notify users while exited COLO Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 11/26] qapi/migration.json: Rename COLO unknown mode to none mode Jason Wang
2018-10-19 3:22 ` Jason Wang [this message]
2018-10-19 15:30 ` [Qemu-devel] [PULL V2 12/26] qapi: Add new command to query colo status Eric Blake
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 13/26] savevm: split the process of different stages for loadvm/savevm Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 14/26] COLO: flush host dirty ram from cache Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 15/26] filter: Add handle_event method for NetFilterClass Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 16/26] filter-rewriter: handle checkpoint and failover event Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 17/26] COLO: notify net filters about checkpoint/failover event Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 18/26] COLO: quick failover process by kick COLO thread Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 19/26] docs: Add COLO status diagram to COLO-FT.txt Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 20/26] clean up callback when del virtqueue Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 21/26] ne2000: fix possible out of bound access in ne2000_receive Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 22/26] rtl8139: fix possible out of bound access Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 23/26] pcnet: fix possible buffer overflow Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 24/26] net: ignore packet size greater than INT_MAX Jason Wang
2018-11-13 15:41 ` Dima Stepanov
2018-11-14 2:59 ` Jason Wang
2018-11-14 16:23 ` Dima Stepanov
2018-11-15 2:47 ` Jason Wang
2018-11-16 7:48 ` Dima Stepanov
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 25/26] e1000: indicate dropped packets in HW counters Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 26/26] qemu-options: Fix bad "macaddr" property in the documentation Jason Wang
2018-10-19 15:17 ` [Qemu-devel] [PULL V2 00/26] Net patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1539919345-10703-13-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=chen.zhang@intel.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=zhangckid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).