From patchwork Sat May 31 11:51:33 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: 354434 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 A9A88140078 for ; Sat, 31 May 2014 22:05:02 +1000 (EST) Received: from localhost ([::1]:59155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqi20-0005V7-9k for incoming@patchwork.ozlabs.org; Sat, 31 May 2014 08:05:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpu-0001HG-KN for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wqhpi-0007d8-Hc for qemu-devel@nongnu.org; Sat, 31 May 2014 07:52:30 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38506 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqhpi-0007d1-AG 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 80757A0345; 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:33 +0200 Message-Id: <1401537111-10221-55-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 54/72] qapi: Extract BlockdevOptionsGenericCOWFormat 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 | 17 ----------------- qapi/block-core.json | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index e96b746..ad0f1ae 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3162,23 +3162,6 @@ 'returns': ['RxFilterInfo'] } ## -# @BlockdevOptionsGenericCOWFormat -# -# Driver specific block device options for image format that have no option -# besides their data source and an optional backing file. -# -# @backing: #optional reference to or definition of the backing file block -# device (if missing, taken from the image file content). It is -# allowed to pass an empty string here in order to disable the -# default backing file. -# -# Since: 1.7 -## -{ 'type': 'BlockdevOptionsGenericCOWFormat', - 'base': 'BlockdevOptionsGenericFormat', - 'data': { '*backing': 'BlockdevRef' } } - -## # @BlockdevOptionsQcow2 # # Driver specific block device options for qcow2. diff --git a/qapi/block-core.json b/qapi/block-core.json index 3ce836c..b762e67 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1195,3 +1195,20 @@ { 'type': 'BlockdevOptionsGenericFormat', 'data': { 'file': 'BlockdevRef' } } +## +# @BlockdevOptionsGenericCOWFormat +# +# Driver specific block device options for image format that have no option +# besides their data source and an optional backing file. +# +# @backing: #optional reference to or definition of the backing file block +# device (if missing, taken from the image file content). It is +# allowed to pass an empty string here in order to disable the +# default backing file. +# +# Since: 1.7 +## +{ 'type': 'BlockdevOptionsGenericCOWFormat', + 'base': 'BlockdevOptionsGenericFormat', + 'data': { '*backing': 'BlockdevRef' } } +