From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHiZm-0004ML-W5 for qemu-devel@nongnu.org; Thu, 15 Dec 2016 21:48:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cHiZm-0002wJ-3V for qemu-devel@nongnu.org; Thu, 15 Dec 2016 21:48:51 -0500 Received: from [59.151.112.132] (port=7012 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHiZl-0002vG-DK for qemu-devel@nongnu.org; Thu, 15 Dec 2016 21:48:50 -0500 From: Zhang Chen Date: Fri, 16 Dec 2016 10:46:42 +0800 Message-ID: <1481856403-23599-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> In-Reply-To: <1481856403-23599-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1481856403-23599-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH for-2.9 V4 1/2] Add a new qmp command to start/stop replication List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Jason Wang , Eric Blake Cc: Zhang Chen , Li Zhijian , zhanghailiang , "eddie . dong" , Bian Naimeng , Changlong Xie , Wen Congyang We can call this qmp command to start/stop replication outside of qemu. Like Xen colo need this function. Signed-off-by: Zhang Chen Signed-off-by: Wen Congyang --- docs/qmp-commands.txt | 18 ++++++++++++++++++ migration/colo.c | 23 +++++++++++++++++++++++ qapi-schema.json | 19 +++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt index abf210a..a8e9eb6 100644 --- a/docs/qmp-commands.txt +++ b/docs/qmp-commands.txt @@ -432,6 +432,24 @@ 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 failover when stopping replication, but cannot be + specified if 'enable' is true (optional, default false). + +Example: + +-> { "execute": "xen-set-replicate", + "arguments": {"enable": true, "primary": false} } +<- { "return": {} } + migrate ------- diff --git a/migration/colo.c b/migration/colo.c index 93c85c5..6fc2ade 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,27 @@ 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"); + return; + } + + 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..78802f4 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4676,6 +4676,25 @@ { '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: #optional true to do failover, false to stop. but cannot be +# specified if 'enable' is true. default value is false. +# +# Returns: nothing. +# +# Since: 2.9 +## +{ 'command': 'xen-set-replication', + 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } + +## # @GICCapability: # # The struct describes capability for a specific GIC (Generic -- 2.7.4