| Message ID | 1480572399-10455-3-git-send-email-zhangchen.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 12/01/2016 12:06 AM, Zhang Chen wrote: > We can call this qmp command to start/stop replication outside of qemu. > Like Xen colo need this function. > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> > --- > +++ b/qapi-schema.json > @@ -4676,6 +4676,24 @@ > { 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} } > > ## > +# @xen-set-replication > +# > +# Enable or disable replication > +# > +# @enable: true to enable, false to disable. > +# > +# @primary: true for primary or false for secondary > +# > +# @failover: true to do failover, false to stop Missing an #optional marker, as well as the default value. > +# > +# Returns: nothing > +# > +# Since: 2.8 You've missed 2.8. This must be 2.9. > +## > +{ 'command': 'xen-set-replication', > + 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } > + > +## > # @GICCapability: > # > # The struct describes capability for a specific GIC (Generic >
On 12/01/2016 10:55 PM, Eric Blake wrote: > On 12/01/2016 12:06 AM, Zhang Chen wrote: >> We can call this qmp command to start/stop replication outside of qemu. >> Like Xen colo need this function. >> >> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> >> --- >> +++ b/qapi-schema.json >> @@ -4676,6 +4676,24 @@ >> { 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} } >> >> ## >> +# @xen-set-replication >> +# >> +# Enable or disable replication >> +# >> +# @enable: true to enable, false to disable. >> +# >> +# @primary: true for primary or false for secondary >> +# >> +# @failover: true to do failover, false to stop > Missing an #optional marker, as well as the default value. I will add this in next version. > >> +# >> +# Returns: nothing >> +# >> +# Since: 2.8 > You've missed 2.8. This must be 2.9. good catch. Thanks Zhang Chen > >> +## >> +{ 'command': 'xen-set-replication', >> + 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } >> + >> +## >> # @GICCapability: >> # >> # The struct describes capability for a specific GIC (Generic >>
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt index abf210a..c6e8c43 100644 --- a/docs/qmp-commands.txt +++ b/docs/qmp-commands.txt @@ -432,6 +432,23 @@ Example: "arguments": { "enable": true } } <- { "return": {} } +xen-set-replication +------- + +Enable or disable replication. + +Arguments: + +- "enable": Enable it or disable it. +- "primary": true for primary or false for secondary +- "failover": Enable to do failover when stoping replcation + +Example: + +-> { "execute": "xen-set-replicate", + "arguments": {"enable": true, "primary": false} } +<- { "return": {} } + migrate ------- diff --git a/migration/colo.c b/migration/colo.c index 93c85c5..007e699 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -19,6 +19,8 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "migration/failover.h" +#include "replication.h" +#include "qmp-commands.h" #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) @@ -104,6 +106,26 @@ void colo_do_failover(MigrationState *s) } } +void qmp_xen_set_replication(bool enable, bool primary, + bool has_failover, bool failover, + Error **errp) +{ + ReplicationMode mode = primary ? + REPLICATION_MODE_PRIMARY : + REPLICATION_MODE_SECONDARY; + + if (has_failover && enable) { + error_setg(errp, "Parameter 'failover' is only for" + " stopping replication"); + } + + if (enable) { + replication_start_all(mode, errp); + } else { + replication_stop_all(failover, failover ? NULL : errp); + } +} + static void colo_send_message(QEMUFile *f, COLOMessage msg, Error **errp) { diff --git a/qapi-schema.json b/qapi-schema.json index f3e9bfc..3658764 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4676,6 +4676,24 @@ { 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} } ## +# @xen-set-replication +# +# Enable or disable replication +# +# @enable: true to enable, false to disable. +# +# @primary: true for primary or false for secondary +# +# @failover: true to do failover, false to stop +# +# Returns: nothing +# +# Since: 2.8 +## +{ 'command': 'xen-set-replication', + 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } + +## # @GICCapability: # # The struct describes capability for a specific GIC (Generic