From patchwork Sat May 31 11:51:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 354433 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 17D41140078 for ; Sat, 31 May 2014 22:04:55 +1000 (EST) Received: from localhost ([::1]:59153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqi1t-0005MT-1M for incoming@patchwork.ozlabs.org; Sat, 31 May 2014 08:04:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpq-000196-La for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wqhpd-0007bO-TA for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:26 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38501 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpd-0007b1-Ij for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:13 -0400 Received: from paradis.irqsave.net (unknown [192.168.77.254]) by paradis.irqsave.net (Postfix) with ESMTP id BD3D2A0321; Sat, 31 May 2014 13:52:12 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Sat, 31 May 2014 13:51:23 +0200 Message-Id: <1401537111-10221-45-git-send-email-benoit.canet@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401537111-10221-1-git-send-email-benoit.canet@irqsave.net> References: <1401537111-10221-1-git-send-email-benoit.canet@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 80.12.84.125 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , Benoit Canet , lcapitulino@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v1 44/72] qapi: Extract drive-mirror-replace definition into qapi/block-core.json X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Canet --- qapi-schema.json | 33 --------------------------------- qapi/block-core.json | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 2c625aa..5ae556c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1621,39 +1621,6 @@ 'data': {'device': 'str', 'target': 'str', '*arg': 'str'} } ## -# @drive-mirror-replace: -# -# Manually trigger completion of an active background drive-mirror operation -# and replace the target reference with the new mirror. -# This switches the device to write to the target path only. -# The ability to complete is signaled with a BLOCK_JOB_READY event. -# -# This command completes an active drive-mirror background operation -# synchronously and replaces the target reference with the mirror. -# The ordering of this command's return with the BLOCK_JOB_COMPLETED event -# is not defined. Note that if an I/O error occurs during the processing of -# this command: 1) the command itself will fail; 2) the error will be processed -# according to the rerror/werror arguments that were specified when starting -# the operation. -# -# A cancelled or paused drive-mirror job cannot be completed. -# -# @device: the device name -# @target-reference: the id or node name of the block driver state to replace -# @new-node-name: #optional set the node-name of the new block driver state -# needed if the target reference points to a regular node of -# the graph -# -# Returns: Nothing on success -# If no background operation is active on this device, DeviceNotActive -# -# Since: 2.1 -## -{ 'command': 'drive-mirror-replace', - 'data': { 'device': 'str', 'target-reference': 'str', - '*new-node-name': 'str' } } - -## # @ObjectTypeInfo: # # This structure describes a search result from @qom-list-types diff --git a/qapi/block-core.json b/qapi/block-core.json index 55aaf23..1049a05 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1007,3 +1007,36 @@ ## { 'command': 'block-job-complete', 'data': { 'device': 'str' } } +## +# @drive-mirror-replace: +# +# Manually trigger completion of an active background drive-mirror operation +# and replace the target reference with the new mirror. +# This switches the device to write to the target path only. +# The ability to complete is signaled with a BLOCK_JOB_READY event. +# +# This command completes an active drive-mirror background operation +# synchronously and replaces the target reference with the mirror. +# The ordering of this command's return with the BLOCK_JOB_COMPLETED event +# is not defined. Note that if an I/O error occurs during the processing of +# this command: 1) the command itself will fail; 2) the error will be processed +# according to the rerror/werror arguments that were specified when starting +# the operation. +# +# A cancelled or paused drive-mirror job cannot be completed. +# +# @device: the device name +# @target-reference: the id or node name of the block driver state to replace +# @new-node-name: #optional set the node-name of the new block driver state +# needed if the target reference points to a regular node of +# the graph +# +# Returns: Nothing on success +# If no background operation is active on this device, DeviceNotActive +# +# Since: 2.1 +## +{ 'command': 'drive-mirror-replace', + 'data': { 'device': 'str', 'target-reference': 'str', + '*new-node-name': 'str' } } +