From patchwork Thu Jun 5 11:45:30 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: 356314 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 3764E140093 for ; Thu, 5 Jun 2014 21:49:22 +1000 (EST) Received: from localhost ([::1]:40095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWAa-0000hl-6m for incoming@patchwork.ozlabs.org; Thu, 05 Jun 2014 07:49:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsW7B-0004Ej-2b for qemu-devel@nongnu.org; Thu, 05 Jun 2014 07:45:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsW6y-0007JT-TA for qemu-devel@nongnu.org; Thu, 05 Jun 2014 07:45:49 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:45524 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsW6y-0007J1-JP for qemu-devel@nongnu.org; Thu, 05 Jun 2014 07:45:36 -0400 Received: from paradis.irqsave.net (unknown [192.168.77.254]) by paradis.irqsave.net (Postfix) with ESMTP id F1AFDA3CE5; Thu, 5 Jun 2014 13:45:34 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Thu, 5 Jun 2014 13:45:30 +0200 Message-Id: <1401968733-10998-3-git-send-email-benoit.canet@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401968733-10998-1-git-send-email-benoit.canet@irqsave.net> References: <1401968733-10998-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 v2 2/5] qapi: create two block related json modules 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 qapi/block-core.json contains block definitions unrelated to emulation. qapi/block.json is a superset of the previous and contains definitions related to emulation. The purpose of these extractions is to be able to hook qapi/block-core.json generated code on qemu-nbd. Signed-off-by: Benoit Canet Reviewed-by: Eric Blake --- qapi-schema.json | 3 +++ qapi/block-core.json | 6 ++++++ qapi/block.json | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 qapi/block-core.json create mode 100644 qapi/block.json diff --git a/qapi-schema.json b/qapi-schema.json index cc71b27..7d47f4d 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5,6 +5,9 @@ # QAPI common definitions { 'include': 'qapi/common.json' } +# QAPI block definitions +{ 'include': 'qapi/block.json' } + ## # LostTickPolicy: # diff --git a/qapi/block-core.json b/qapi/block-core.json new file mode 100644 index 0000000..11bd8c2 --- /dev/null +++ b/qapi/block-core.json @@ -0,0 +1,6 @@ +# -*- Mode: Python -*- +# +# QAPI block core definitions (vm unrelated) + +# QAPI common definitions +{ 'include': 'common.json' } diff --git a/qapi/block.json b/qapi/block.json new file mode 100644 index 0000000..e2b882f --- /dev/null +++ b/qapi/block.json @@ -0,0 +1,7 @@ +# -*- Mode: Python -*- +# +# QAPI block definitions (vm related) + +# QAPI block core definitions +{ 'include': 'block-core.json' } +