From patchwork Sat May 31 11:51:20 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: 354429 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 16350140078 for ; Sat, 31 May 2014 22:03:11 +1000 (EST) Received: from localhost ([::1]:59134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqi0D-0002Y3-0q for incoming@patchwork.ozlabs.org; Sat, 31 May 2014 08:03:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpn-00012i-0I for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wqhpc-0007ZK-A9 for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:22 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38498 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpc-0007Yy-3z for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:12 -0400 Received: from paradis.irqsave.net (unknown [192.168.77.254]) by paradis.irqsave.net (Postfix) with ESMTP id 3BE7BA0315; Sat, 31 May 2014 13:52:11 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Sat, 31 May 2014 13:51:20 +0200 Message-Id: <1401537111-10221-42-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 41/72] qapi: Extract block-job-pause 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 | 23 ----------------------- qapi/block-core.json | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 75d76f9..17d92df 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1621,29 +1621,6 @@ 'data': {'device': 'str', 'target': 'str', '*arg': 'str'} } ## -# @block-job-pause: -# -# Pause an active background block operation. -# -# This command returns immediately after marking the active background block -# operation for pausing. It is an error to call this command if no -# operation is in progress. Pausing an already paused job has no cumulative -# effect; a single block-job-resume command will resume the job. -# -# The operation will pause as soon as possible. No event is emitted when -# the operation is actually paused. Cancelling a paused job automatically -# resumes it. -# -# @device: the device name -# -# Returns: Nothing on success -# If no background operation is active on this device, DeviceNotActive -# -# Since: 1.3 -## -{ 'command': 'block-job-pause', 'data': { 'device': 'str' } } - -## # @block-job-resume: # # Resume an active background block operation. diff --git a/qapi/block-core.json b/qapi/block-core.json index 6a3de86..51c941a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -938,3 +938,26 @@ ## { 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' } } +## +# @block-job-pause: +# +# Pause an active background block operation. +# +# This command returns immediately after marking the active background block +# operation for pausing. It is an error to call this command if no +# operation is in progress. Pausing an already paused job has no cumulative +# effect; a single block-job-resume command will resume the job. +# +# The operation will pause as soon as possible. No event is emitted when +# the operation is actually paused. Cancelling a paused job automatically +# resumes it. +# +# @device: the device name +# +# Returns: Nothing on success +# If no background operation is active on this device, DeviceNotActive +# +# Since: 1.3 +## +{ 'command': 'block-job-pause', 'data': { 'device': 'str' } } +