diff options
| author | Zhang Chen <zhangchen.fnst@cn.fujitsu.com> | 2017-02-25 10:46:04 +0800 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@kernel.org> | 2017-02-28 11:02:12 -0800 |
| commit | daa33c52153df48ef0a7d06013f8ca6f24eff92f (patch) | |
| tree | 0f2baff4452bdfefd3d03f7b32acde9f79cb1b84 | |
| parent | 2c9639ecabdb18c3281eba03c509f55efde80aa0 (diff) | |
| download | qemu-daa33c52153df48ef0a7d06013f8ca6f24eff92f.zip qemu-daa33c52153df48ef0a7d06013f8ca6f24eff92f.tar.gz qemu-daa33c52153df48ef0a7d06013f8ca6f24eff92f.tar.bz2 | |
Add a new qmp command to do checkpoint, query xen replication status
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>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
| -rw-r--r-- | migration/colo.c | 23 | ||||
| -rw-r--r-- | qapi-schema.json | 48 |
2 files changed, 71 insertions, 0 deletions
diff --git a/migration/colo.c b/migration/colo.c index 46bc84d..c19eb3f 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -173,6 +173,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->error = true; + s->has_desc = true; + s->desc = g_strdup(error_get_pretty(err)); + } else { + s->error = 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 dbc1ebc..d6186d4 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -6015,6 +6015,54 @@ 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } ## +# @ReplicationStatus: +# +# The result format for 'query-xen-replication-status'. +# +# @error: true if an error happened, false if replication is normal. +# +# @desc: #optional the human readable error description string, when +# @error is 'true'. +# +# Since: 2.9 +## +{ 'struct': 'ReplicationStatus', + 'data': { 'error': 'bool', '*desc': 'str' } } + +## +# @query-xen-replication-status: +# +# Query replication status while the vm is running. +# +# Returns: A @ReplicationResult object showing the status. +# +# Example: +# +# -> { "execute": "query-xen-replication-status" } +# <- { "return": { "error": false } } +# +# 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 |