|
From: | Zhang Chen |
Subject: | Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status |
Date: | Tue, 21 Feb 2017 21:16:31 +0800 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 |
On 02/21/2017 09:01 PM, Hailiang Zhang wrote:
On 2017/2/8 13:24, Zhang Chen wrote:We can call this qmp command to do checkpoint outside of qemu. Xen colo will need this function. Signed-off-by: Zhang Chen <address@hidden> Signed-off-by: Wen Congyang <address@hidden> --- migration/colo.c | 17 ++++++++++++++++qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++2 files changed, 77 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 6fc2ade..2f98a33 100644 --- a/migration/colo.c +++ b/migration/colo.c@@ -127,6 +127,23 @@ void qmp_xen_set_replication(bool enable, bool primary,} } +ReplicationResult *qmp_query_xen_replication_status(Error **errp) +{ + Error *err = NULL; + ReplicationResult *result = g_new0(ReplicationResult, 1);Indent, line break.
OK~~ will fix in next version.
+ replication_get_error_all(&err); + result->status = err ? + REPLICATION_STATUS_ERROR : + REPLICATION_STATUS_NORMAL; + error_free(err); + return result; +} + +void qmp_xen_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..719744a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5931,6 +5931,66 @@'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } }## +# @ReplicationStatus: +# +# Describe the status of replication. +# +# @error: Replication has an error. +# +# @normal: Replication is running normally. +# +# Since: 2.9 +## +{ 'enum': 'ReplicationStatus', + 'data': [ 'error', 'normal' ] } + +## +# @ReplicationResult: +# +# The result format for 'query-xen-replication-status'. +# +# @status: enum of @ReplicationStatus, which shows current +# replication error status +# +# Since: 2.9 +## +{ 'struct': 'ReplicationResult', + 'data': { 'status': 'ReplicationStatus'} }^ Space
OK.
+ +## +# @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': 'ReplicationResult' } + +## +# @xen-do-checkpoint: +#Maybe use the name 'xen-checkpoint-notify' or 'xen-colo-checkpoint-notify' ?
I will change the name to 'xen-colo-checkpoint-notify'. Thank Zhang Chen
+# Xen uses this command to notify replication to trigger a checkpoint. +# +# Returns: nothing. +# +# Example: +# +# -> { "execute": "xen-do-checkpoint" } +# <- { "return": {} } +# +# Since: 2.9 +## +{ 'command': 'xen-do-checkpoint' } + +## # @GICCapability: # # The struct describes capability for a specific GIC (Generic.
-- Thanks Zhang Chen
[Prev in Thread] | Current Thread | [Next in Thread] |