From patchwork Sat May 31 11:51:34 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: 354471 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 45FC31400D8 for ; Sat, 31 May 2014 22:23:04 +1000 (EST) Received: from localhost ([::1]:59444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqiJS-0007Cy-Eq for incoming@patchwork.ozlabs.org; Sat, 31 May 2014 08:23:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpv-0001Jh-Ue for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wqhpi-0007dO-RB for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:31 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38503 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpi-0007bd-Ly for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:18 -0400 Received: from paradis.irqsave.net (unknown [192.168.77.254]) by paradis.irqsave.net (Postfix) with ESMTP id EB3C8A0347; Sat, 31 May 2014 13:52:17 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Sat, 31 May 2014 13:51:34 +0200 Message-Id: <1401537111-10221-56-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 55/72] qapi: Extract BlockdevOptionsQcow2 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 | 28 ---------------------------- qapi/block-core.json | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index ad0f1ae..63a0de3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3162,34 +3162,6 @@ 'returns': ['RxFilterInfo'] } ## -# @BlockdevOptionsQcow2 -# -# Driver specific block device options for qcow2. -# -# @lazy-refcounts: #optional whether to enable the lazy refcounts -# feature (default is taken from the image file) -# -# @pass-discard-request: #optional whether discard requests to the qcow2 -# device should be forwarded to the data source -# -# @pass-discard-snapshot: #optional whether discard requests for the data source -# should be issued when a snapshot operation (e.g. -# deleting a snapshot) frees clusters in the qcow2 file -# -# @pass-discard-other: #optional whether discard requests for the data source -# should be issued on other occasions where a cluster -# gets freed -# -# Since: 1.7 -## -{ 'type': 'BlockdevOptionsQcow2', - 'base': 'BlockdevOptionsGenericCOWFormat', - 'data': { '*lazy-refcounts': 'bool', - '*pass-discard-request': 'bool', - '*pass-discard-snapshot': 'bool', - '*pass-discard-other': 'bool' } } - -## # @BlkdebugEvent # # Trigger events supported by blkdebug. diff --git a/qapi/block-core.json b/qapi/block-core.json index b762e67..fcb2625 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1212,3 +1212,31 @@ 'base': 'BlockdevOptionsGenericFormat', 'data': { '*backing': 'BlockdevRef' } } +## +# @BlockdevOptionsQcow2 +# +# Driver specific block device options for qcow2. +# +# @lazy-refcounts: #optional whether to enable the lazy refcounts +# feature (default is taken from the image file) +# +# @pass-discard-request: #optional whether discard requests to the qcow2 +# device should be forwarded to the data source +# +# @pass-discard-snapshot: #optional whether discard requests for the data source +# should be issued when a snapshot operation (e.g. +# deleting a snapshot) frees clusters in the qcow2 file +# +# @pass-discard-other: #optional whether discard requests for the data source +# should be issued on other occasions where a cluster +# gets freed +# +# Since: 1.7 +## +{ 'type': 'BlockdevOptionsQcow2', + 'base': 'BlockdevOptionsGenericCOWFormat', + 'data': { '*lazy-refcounts': 'bool', + '*pass-discard-request': 'bool', + '*pass-discard-snapshot': 'bool', + '*pass-discard-other': 'bool' } } +