We can call this qmp command to do checkpoint outside of qemu. Xen colo will need this function.
Signed-off-by: Zhang Chen <zhangchen.f...@cn.fujitsu.com> Signed-off-by: Wen Congyang <wencongy...@gmail.com> --- docs/qmp-commands.txt | 24 ++++++++++++++++++++++++ migration/colo.c | 17 +++++++++++++++++ qapi-schema.json | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt index d182147..0ed6cf4 100644 --- a/docs/qmp-commands.txt +++ b/docs/qmp-commands.txt @@ -450,6 +450,30 @@ Example: "arguments": {"enable": true, "primary": false} } <- { "return": {} } +query-xen-replication-status +---------------------------- + +Query replication status when vm is running. + +Arguments: None. + +Example: + +-> { "execute": "query-xen-replication-status" } +<- { "return": { "status": "normal" } } + +xen-do-checkpoint +----------------- + +Xen uses this command to notify replication to trigger a checkpoint. + +Arguments: None. + +Example: + +-> { "execute": "xen-do-checkpoint" } +<- { "return": {} } + migrate ------- 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); + 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 78802f4..f23c657 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4695,6 +4695,56 @@ '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'} } + +## +# @query-xen-replication-status +# +# Query replication status while the vm is running. +# +# Returns: A @ReplicationResult objects showing the status. +# +# Since: 2.9 +## +{ 'command': 'query-xen-replication-status', + 'returns': 'ReplicationResult' } + +## +# @xen-do-checkpoint +# +# Xen uses this command to notify replication to do checkpoint. +# +# Returns: nothing. +# +# Since: 2.9 +## +{ 'command': 'xen-do-checkpoint' } + +## # @GICCapability: # # The struct describes capability for a specific GIC (Generic -- 2.7.4