From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqS5-0008Ce-Gq for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:56:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBqS3-00013b-FN for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:56:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqS3-00013V-Ae for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:56:03 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E455032D3D5 for ; Wed, 23 Dec 2015 20:56:02 +0000 (UTC) From: Eric Blake Date: Wed, 23 Dec 2015 13:55:43 -0700 Message-Id: <1450904145-17721-15-git-send-email-eblake@redhat.com> In-Reply-To: <1450904145-17721-1-git-send-email-eblake@redhat.com> References: <1450904145-17721-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v6 14/16] qapi: Use anonymous base in Netdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com Now that the generator supports it, we might as well use an anonymous base rather than breaking out a single-use NetdevBase structure. Signed-off-by: Eric Blake --- v6: new patch --- qapi-schema.json | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index a400fa3..ad3030f 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2675,30 +2675,20 @@ 'bridge', 'hubport', 'netmap', 'vhost-user' ] } ## -# @NetdevBase -# -# Captures the common configuration of a network device. -# -# @id: identifier for monitor commands. -# -# @type: Specify the driver used for interpreting remaining arguments. -# -# Since 1.2 -## -{ 'struct': 'NetdevBase', - 'data': { 'id': 'str', 'type': 'NetClientDriver' } } - -## # @Netdev # # Captures the configuration of a network device. # +# @id: identifier for monitor commands. +# +# @type: Specify the driver used for interpreting remaining arguments. +# # Since 1.2 # # 'l2tpv3' - since 2.1 ## { 'union': 'Netdev', - 'base': 'NetdevBase', + 'base': { 'id': 'str', 'type': 'NetClientDriver' }, 'discriminator': 'type', 'data': { 'none': 'NetdevNoneOptions', -- 2.4.3