From patchwork Sat May 31 11:51:40 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: 354474 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 305091400D8 for ; Sat, 31 May 2014 22:25:17 +1000 (EST) Received: from localhost ([::1]:59463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqiLb-0002Yt-33 for incoming@patchwork.ozlabs.org; Sat, 31 May 2014 08:25:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpy-0001Od-Gm for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wqhpl-0007g3-Dg for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:34 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38512 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpk-0007fo-Vx for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:21 -0400 Received: from paradis.irqsave.net (unknown [192.168.77.254]) by paradis.irqsave.net (Postfix) with ESMTP id 2C1ECA035C; Sat, 31 May 2014 13:52:20 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Sat, 31 May 2014 13:51:40 +0200 Message-Id: <1401537111-10221-62-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 61/72] qapi: Extract BlockdevOptionsQuorum 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 | 22 ---------------------- qapi/block-core.json | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 2f5e0e2..9e7138e 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3162,28 +3162,6 @@ 'returns': ['RxFilterInfo'] } ## -# @BlockdevOptionsQuorum -# -# Driver specific block device options for Quorum -# -# @blkverify: #optional true if the driver must print content mismatch -# set to false by default -# -# @children: the children block devices to use -# -# @vote-threshold: the vote limit under which a read will fail -# -# @rewrite-corrupted: #optional rewrite corrupted data when quorum is reached -# (Since 2.1) -# -# Since: 2.0 -## -{ 'type': 'BlockdevOptionsQuorum', - 'data': { '*blkverify': 'bool', - 'children': [ 'BlockdevRef' ], - 'vote-threshold': 'int', '*rewrite-corrupted': 'bool' } } - -## # @BlockdevOptions # # Options for creating a block device. diff --git a/qapi/block-core.json b/qapi/block-core.json index ec563d1..2373ef0 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1350,3 +1350,25 @@ 'data': { 'test': 'BlockdevRef', 'raw': 'BlockdevRef' } } +## +# @BlockdevOptionsQuorum +# +# Driver specific block device options for Quorum +# +# @blkverify: #optional true if the driver must print content mismatch +# set to false by default +# +# @children: the children block devices to use +# +# @vote-threshold: the vote limit under which a read will fail +# +# @rewrite-corrupted: #optional rewrite corrupted data when quorum is reached +# (Since 2.1) +# +# Since: 2.0 +## +{ 'type': 'BlockdevOptionsQuorum', + 'data': { '*blkverify': 'bool', + 'children': [ 'BlockdevRef' ], + 'vote-threshold': 'int', '*rewrite-corrupted': 'bool' } } +