From patchwork Thu Sep 10 09:55:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 516205 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 ACCFE140157 for ; Thu, 10 Sep 2015 19:56:42 +1000 (AEST) Received: from localhost ([::1]:48151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZyau-0000Zr-Gy for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2015 05:56:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZyaH-0007rP-Nl for qemu-devel@nongnu.org; Thu, 10 Sep 2015 05:56:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZyaD-0008H6-Fi for qemu-devel@nongnu.org; Thu, 10 Sep 2015 05:56:01 -0400 Received: from [59.151.112.132] (port=28716 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZyaC-0008GC-SE; Thu, 10 Sep 2015 05:55:57 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100563394" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Sep 2015 17:58:50 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t8A9teJS001055; Thu, 10 Sep 2015 17:55:40 +0800 Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 10 Sep 2015 17:55:53 +0800 From: Wen Congyang To: qemu devel , Eric Blake , Markus Armbruster , Alberto Garcia , Stefan Hajnoczi Date: Thu, 10 Sep 2015 17:55:01 +0800 Message-ID: <1441878905-5272-2-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1441878905-5272-1-git-send-email-wency@cn.fujitsu.com> References: <1441878905-5272-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Kevin Wolf , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Yang Hongyang , zhanghailiang Subject: [Qemu-devel] [PATCH v3 1/5] support nbd driver in blockdev-add 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 The NBD driver needs: filename, path or (host, port, exportname). It checks which key exists and decides use unix or inet socket. It doesn't recognize the key type, so we can't use union, and can't reuse InetSocketAddress. Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei --- qapi/block-core.json | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 11134a8..e68a59f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1376,12 +1376,14 @@ # # @host_device, @host_cdrom: Since 2.1 # +# @nbd: Since 2.5 +# # Since: 2.0 ## { 'enum': 'BlockdevDriver', 'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop', 'dmg', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', - 'http', 'https', 'null-aio', 'null-co', 'parallels', + 'http', 'https', 'nbd', 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'tftp', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] } @@ -1797,6 +1799,42 @@ '*read-pattern': 'QuorumReadPattern' } } ## +# @BlockdevOptionsNBD +# +# Driver specific block device options for NBD +# +# @filename: #optional unix or inet path. The format is: +# unix: nbd+unix:///export?socket=path or +# nbd:unix:path:exportname=export +# inet: nbd[+tcp]://host[:port]/export or +# nbd:host[:port]:exportname=export +# +# @path: #optional filesystem path to use +# +# @host: #optional host part of the address +# +# @port: #optional port part of the address +# +# @ipv4: #optional whether to accept IPv4 addresses, default try both IPv4 +# and IPv6 +# +# @ipv6: #optional whether to accept IPv6 addresses, default try both IPv4 +# and IPv6 +# +# @export: #optional the NBD export name +# +# Since: 2.5 +## +{ 'struct': 'BlockdevOptionsNBD', + 'data': { '*filename': 'str', + '*path': 'str', + '*host': 'str', + '*port': 'str', + '*ipv4': 'bool', + '*ipv6': 'bool', + '*export': 'str' } } + +## # @BlockdevOptions # # Options for creating a block device. @@ -1822,7 +1860,7 @@ 'http': 'BlockdevOptionsFile', 'https': 'BlockdevOptionsFile', # TODO iscsi: Wait for structured options -# TODO nbd: Should take InetSocketAddress for 'host'? + 'nbd': 'BlockdevOptionsNBD', # TODO nfs: Wait for structured options 'null-aio': 'BlockdevOptionsNull', 'null-co': 'BlockdevOptionsNull',