From patchwork Fri Aug 21 15:37:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 509526 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 06C441402A9 for ; Sat, 22 Aug 2015 01:41:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=aUP6Hpk4; dkim-atps=neutral Received: from localhost ([::1]:42170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoRS-0007du-UC for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2015 11:41:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoO4-00029Q-FE for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:37:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSoO3-000211-Ja for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:37:48 -0400 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:34861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoO3-00020c-DW for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:37:47 -0400 Received: by wicne3 with SMTP id ne3so19118316wic.0 for ; Fri, 21 Aug 2015 08:37:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=qW4uDs0L8O0cVHM7kDBoqza4KEBBmf4Ie/3oN81G7fA=; b=aUP6Hpk43oXjCIbU5r1LhN4QxYx4QvlasygEAW3NvpRLv3NrC9FbuTH26zqbQxmgNF jpIXJ7evcRjRu6Kcqfw5npnd4fqdq6RRLeFcHHoVPWaClsa55ztqFePqz5v4/ejbhVLi 4t+4yjxuIlpoIcwfobxC8S8emayndm1YOUjQUDY3sTSoXbuqXvouFOMbzgIFO12CfWn0 Nd2svWmd4QMdY+sayLCAaMj2U/kfu3SBlQmQUwMAxpkZQgDULDWD0Yev6zTu6iN3snwX Q+dOyHKJZuzv2nd7fFxxy+XJnOWFQ4ruDN+c/DukD4v8FBjToA7XAfeiTDIsYkPFFMfk AfOQ== X-Received: by 10.180.12.145 with SMTP id y17mr2823376wib.87.1440171466631; Fri, 21 Aug 2015 08:37:46 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (178-164-172-216.pool.digikabel.hu. [178.164.172.216]) by smtp.gmail.com with ESMTPSA id v8sm10479895wjr.15.2015.08.21.08.37.45 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Aug 2015 08:37:46 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Fri, 21 Aug 2015 17:37:03 +0200 Message-Id: <1c03f98d0cb2ed5e29afc27a9096eb32d8482a31.1440171025.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::234 Cc: Gerd Hoffmann , Markus Armbruster Subject: [Qemu-devel] [PATCH v2 07/49] qapi: reorder NetdevBase and Netdev 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 Probably more logical if NetdevBase comes before Netdev. No schematic changes. Signed-off-by: Kővágó, Zoltán Reviewed-by: Eric Blake --- qapi-schema.json | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index efc91db..c9d9263 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2485,6 +2485,29 @@ 'bridge', 'hubport', 'netmap', 'vhost-user' ] } ## +# @NetdevBase +# +# Captures the commopn configuration of a network device. +# +# @vlan: #optional vlan number (legacy, forbidden with -netdev) +# +# @id: #optional identifier for monitor commands (required with -netdev) +# +# @name: #optional identifier for monitor commands, ignored if @id is present +# (legacy, forbidden with -netdev) +# +# @type: the netdev driver to use +# +# Since 2.5 +## +{ 'struct': 'NetdevBase', + 'data': { + '*vlan': 'int32', + '*id': 'str', + '*name': 'str', + 'type': 'NetClientDriver' } } + +## # @Netdev # # Captures the configuration of a network device. @@ -2514,29 +2537,6 @@ 'vhost-user': 'NetdevVhostUserOptions' } } ## -# @NetdevBase -# -# Captures the common configuration of a network device. -# -# @vlan: #optional vlan number (legacy, forbidden with -netdev) -# -# @id: #optional identifier for monitor commands (required with -netdev) -# -# @name: #optional identifier for monitor commands, ignored if @id is present -# (legacy, forbidden with -netdev) -# -# @type: the netdev driver to use -# -# Since 2.5 -## -{ 'struct': 'NetdevBase', - 'data': { - '*vlan': 'int32', - '*id': 'str', - '*name': 'str', - 'type': 'NetClientDriver' } } - -## # @InetSocketAddress # # Captures a socket address or address range in the Internet namespace.