From patchwork Mon Sep 7 12:14:08 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: 515107 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 58A6E1401CB for ; Mon, 7 Sep 2015 22:14:34 +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=L3rC0053; dkim-atps=neutral Received: from localhost ([::1]:56305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYvJg-00013M-JT for incoming@patchwork.ozlabs.org; Mon, 07 Sep 2015 08:14:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYvJA-0000MK-JK for qemu-devel@nongnu.org; Mon, 07 Sep 2015 08:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYvJ9-0005wM-FG for qemu-devel@nongnu.org; Mon, 07 Sep 2015 08:14:00 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:34522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYvJ9-0005w8-9c for qemu-devel@nongnu.org; Mon, 07 Sep 2015 08:13:59 -0400 Received: by wicfx3 with SMTP id fx3so86628666wic.1 for ; Mon, 07 Sep 2015 05:13:58 -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=gElukO58r3OLcYCeIfiVSPEV1SpEJIjEU09VkLa3MME=; b=L3rC0053r1H9AoOVQf+HoBks0xYfUpsdovW2ahhJa0AXgr/91JcnoVZqHXquaO5/eR gTs1PPrl+rD8qLUw+akZmNd1AE3TZ8NfV81xZEoiFhPu43tX/T4UeCMHsyPKgAgmd/HI 689rkXZ9EJhw5jDqf9v6L0LKrGA/5TLnBHxaiLYFTvWsd1rv08U1uIbJe9sZg21R9XNO jqHI/1co3YKMI6T4zKWtsqS73pfSBjRp92coBkQTh/A1gx2weY/HWOFr6omus4m29A55 Sm1lficRjj/6brM3X0OomEDLwZIB1EIaeTSgaEqg5y5AjxQ/yeHZBR7zKa/RVlZv/2vU 5+Ow== X-Received: by 10.180.91.194 with SMTP id cg2mr12068352wib.72.1441628038411; Mon, 07 Sep 2015 05:13:58 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (188-143-119-255.pool.digikabel.hu. [188.143.119.255]) by smtp.gmail.com with ESMTPSA id p5sm20117214wiy.17.2015.09.07.05.13.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Sep 2015 05:13:57 -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: Mon, 7 Sep 2015 14:14:08 +0200 Message-Id: <769f45bd86f98be631d003ae3b83615061e944b7.1441627176.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.5.1 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::236 Cc: Markus Armbruster Subject: [Qemu-devel] [PATCH 6/7] 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 semantic 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 1b828e8..d52b8c6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2499,6 +2499,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. @@ -2528,29 +2551,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.