From patchwork Thu Jan 5 06:08:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 711249 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tvHPk2hMYz9t17 for ; Thu, 5 Jan 2017 17:11:38 +1100 (AEDT) Received: from localhost ([::1]:43948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cP1Gy-0004Qa-71 for incoming@patchwork.ozlabs.org; Thu, 05 Jan 2017 01:11:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cP1Fl-0003ag-9X for qemu-devel@nongnu.org; Thu, 05 Jan 2017 01:10:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cP1Fh-0000hn-GY for qemu-devel@nongnu.org; Thu, 05 Jan 2017 01:10:21 -0500 Received: from [59.151.112.132] (port=43125 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cP1Fh-0000TG-3O for qemu-devel@nongnu.org; Thu, 05 Jan 2017 01:10:17 -0500 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="14493470" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 05 Jan 2017 14:09:56 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id B105946701D4; Thu, 5 Jan 2017 14:09:56 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 5 Jan 2017 14:09:56 +0800 From: Zhang Chen To: qemu devel , Eric Blake Date: Thu, 5 Jan 2017 14:08:52 +0800 Message-ID: <1483596532-14552-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483596532-14552-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1483596532-14552-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: B105946701D4.AD738 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V6 2/2] Add a new qmp command to do checkpoint, query xen replication status X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Li Zhijian , Jason Wang , "eddie . dong" , Wen Congyang , Bian Naimeng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We can call this qmp command to do checkpoint outside of qemu. Xen colo will need this function. Signed-off-by: Zhang Chen Signed-off-by: Wen Congyang --- 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