From patchwork Thu Aug 6 18:28:18 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: 504929 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 C87AD1402AC for ; Fri, 7 Aug 2015 07:58:44 +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=fLRIWq0B; dkim-atps=neutral Received: from localhost ([::1]:46892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNTBT-0000Xm-42 for incoming@patchwork.ozlabs.org; Thu, 06 Aug 2015 17:58:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPu9-00081V-6h for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNPu2-00017Y-41 for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:34 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:36046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPtz-00016a-42 for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:30 -0400 Received: by wicgj17 with SMTP id gj17so33348742wic.1 for ; Thu, 06 Aug 2015 11:28:26 -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=hO4WfRxRbi2CZVBwAOFBrsAvesI8wfLxcWdSs2VcPyI=; b=fLRIWq0BaJO2A0hL+LhBwgIh+QntXd7HRv0RNajFSviA6E/hacmJOcQ/JsHQ8ldX14 ryr2SVIpjZihVjIZRIXveVRS5zjnRifrOfaqVssXABN0Nnc0yZGYrTQxKrrntTe3pz0J RdGTCAfss02ScaUDyawteqCTEa+y3S/gtTEbDLl7mnUtzKG6+TSWcwuyjQWMy+C3xfdT vZiSeoeygKYLVbZScjYat/tHGnz7ElW2Uiua4UMfTWTmjWGn+F+3XqvhsiT1YX/kPhD1 cPWPfcETK9PN88GHTUFd32VWIrmjosygWk+7qc+C5XKS+rFg6ldusu50+5ZFSfYtXg4f 6HoQ== X-Received: by 10.180.91.132 with SMTP id ce4mr8588638wib.45.1438885706520; Thu, 06 Aug 2015 11:28:26 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (84-236-21-48.pool.digikabel.hu. [84.236.21.48]) by smtp.gmail.com with ESMTPSA id i6sm10726509wje.33.2015.08.06.11.28.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Aug 2015 11:28:25 -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: Thu, 6 Aug 2015 20:28:18 +0200 Message-Id: <33a7fad47e95cfd607cf6ab3e5cc87b09723665f.1438884611.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.4.5 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::22e Cc: Gerd Hoffmann , Markus Armbruster Subject: [Qemu-devel] [PATCH 06/25] 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 --- qapi-schema.json | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index fd6b6a2..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 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' } } - -## # @InetSocketAddress # # Captures a socket address or address range in the Internet namespace.