From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
To: qemu devel <qemu-devel@nongnu.org>,
Eric Blake <eblake@redhat.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>,
Markus Armbruster <armbru@redhat.com>,
Stefano Stabellini <sstabellini@kernel.org>
Cc: Jason Wang <jasowang@redhat.com>,
Zhang Chen <zhangchen.fnst@cn.fujitsu.com>,
Li Zhijian <lizhijian@cn.fujitsu.com>,
"eddie . dong" <eddie.dong@intel.com>,
bian naimeng <biannm@cn.fujitsu.com>,
Wen Congyang <wencongyang@gmail.com>
Subject: [Qemu-devel] [PATCH V8 2/2] Add a new qmp command to do checkpoint, query xen replication status
Date: Thu, 23 Feb 2017 15:14:30 +0800 [thread overview]
Message-ID: <1487834070-31374-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1487834070-31374-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>
We can call this qmp command to do checkpoint outside of qemu.
Xen colo will need this function.
Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Wen Congyang <wencongyang@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
migration/colo.c | 23 +++++++++++++++++++++++
qapi-schema.json | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+)
diff --git a/migration/colo.c b/migration/colo.c
index 6fc2ade..8355933 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -127,6 +127,29 @@ void qmp_xen_set_replication(bool enable, bool primary,
}
}
+ReplicationStatus *qmp_query_xen_replication_status(Error **errp)
+{
+ Error *err = NULL;
+ ReplicationStatus *s = g_new0(ReplicationStatus, 1);
+
+ replication_get_error_all(&err);
+ if (err) {
+ s->status = true;
+ s->has_desc = true;
+ s->desc = g_strdup(error_get_pretty(err));
+ } else {
+ s->status = false;
+ }
+
+ error_free(err);
+ return s;
+}
+
+void qmp_xen_colo_do_checkpoint(Error **errp)
+{
+ replication_do_checkpoint_all(errp);
+}
+
static void colo_send_message(QEMUFile *f, COLOMessage msg,
Error **errp)
{
diff --git a/qapi-schema.json b/qapi-schema.json
index 9445b93..a89ed77 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -5931,6 +5931,54 @@
'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } }
##
+# @ReplicationStatus:
+#
+# The result format for 'query-xen-replication-status'.
+#
+# @status: true to error, false to normal.
+#
+# @desc: #optional the human readable error description string, when
+# @status is 'true'.
+#
+# Since: 2.9
+##
+{ 'struct': 'ReplicationStatus',
+ 'data': { 'status': 'bool', '*desc': 'str' } }
+
+##
+# @query-xen-replication-status:
+#
+# Query replication status while the vm is running.
+#
+# Returns: A @ReplicationResult objects showing the status.
+#
+# Example:
+#
+# -> { "execute": "query-xen-replication-status" }
+# <- { "return": { "status": "normal" } }
+#
+# Since: 2.9
+##
+{ 'command': 'query-xen-replication-status',
+ 'returns': 'ReplicationStatus' }
+
+##
+# @xen-colo-do-checkpoint:
+#
+# Xen uses this command to notify replication to trigger a checkpoint.
+#
+# Returns: nothing.
+#
+# Example:
+#
+# -> { "execute": "xen-colo-do-checkpoint" }
+# <- { "return": {} }
+#
+# Since: 2.9
+##
+{ 'command': 'xen-colo-do-checkpoint' }
+
+##
# @GICCapability:
#
# The struct describes capability for a specific GIC (Generic
--
2.7.4
next prev parent reply other threads:[~2017-02-23 7:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 7:14 [Qemu-devel] [PATCH V8 0/2] Add new qmp commands to suppurt Xen COLO Zhang Chen
2017-02-23 7:14 ` [Qemu-devel] [PATCH V8 1/2] Add a new qmp command to start/stop replication Zhang Chen
2017-02-23 15:31 ` Eric Blake
2017-02-24 3:56 ` Zhang Chen
2017-02-23 7:14 ` Zhang Chen [this message]
2017-02-23 15:34 ` [Qemu-devel] [PATCH V8 2/2] Add a new qmp command to do checkpoint, query xen replication status Eric Blake
2017-02-24 5:33 ` Zhang Chen
2017-03-03 13:45 ` Markus Armbruster
2017-03-03 16:01 ` Eric Blake
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=1487834070-31374-3-git-send-email-zhangchen.fnst@cn.fujitsu.com \
--to=zhangchen.fnst@cn.fujitsu.com \
--cc=armbru@redhat.com \
--cc=biannm@cn.fujitsu.com \
--cc=eblake@redhat.com \
--cc=eddie.dong@intel.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=qemu-devel@nongnu.org \
--cc=sstabellini@kernel.org \
--cc=wencongyang@gmail.com \
--cc=zhang.zhanghailiang@huawei.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).