From patchwork Fri Jul 3 13:45:51 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: 491087 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 C990D14076B for ; Fri, 3 Jul 2015 23:46:30 +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=DuFRxTMF; dkim-atps=neutral Received: from localhost ([::1]:41313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB1IS-0007RD-ON for incoming@patchwork.ozlabs.org; Fri, 03 Jul 2015 09:46:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB1Ho-0006EJ-Ma for qemu-devel@nongnu.org; Fri, 03 Jul 2015 09:45:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZB1Hn-0007Q3-Nu for qemu-devel@nongnu.org; Fri, 03 Jul 2015 09:45:48 -0400 Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]:36721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB1Hn-0007PY-Hp for qemu-devel@nongnu.org; Fri, 03 Jul 2015 09:45:47 -0400 Received: by wguu7 with SMTP id u7so88973047wgu.3 for ; Fri, 03 Jul 2015 06:45: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=Q3QeVM7D6dcadfBgYHOwMqrEcrwdS2suXkAKQxAD61w=; b=DuFRxTMFQSdCja5C2bN9VH/C14m6leJKr8TPd4i6n7QKzevKR3XPHWtCpUsOE0L+dy inOz4ttTQctv+oKvr2mJ63fMtOKyN9+4zBTbinVcJGCodPgYrp/0qNQAcbbobO8S3tf/ ihCb0TTColkFoTr7evTubwUAzP37BqX+3BzoBoKbMMfLAjF8QgSp8u9fhETr/N1oeddV rdX0kDqdR4jc6Os/38Akx8e3I6NLhOlY6RLh0/RNnnNQNxStzeyjvlAWXC3aEUdW9ACO zDKzNMSFYZlzAj6RCA0cQk/6ljLe6yaB7kzhnbpcJc+8IdIkDtjU59gGRmJ6BZmELP5m WMww== X-Received: by 10.180.104.129 with SMTP id ge1mr27537203wib.84.1435931146924; Fri, 03 Jul 2015 06:45:46 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (94-21-30-178.pool.digikabel.hu. [94.21.30.178]) by mx.google.com with ESMTPSA id ej5sm13451036wjd.22.2015.07.03.06.45.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Jul 2015 06:45: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, 3 Jul 2015 15:45:51 +0200 Message-Id: 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:c00::22f Cc: Gerd Hoffmann , Markus Armbruster Subject: [Qemu-devel] [PATCH v2 6/6] 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 b8ee0ad..c4f0623 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2486,6 +2486,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.4 +## +{ 'struct': 'NetdevBase', + 'data': { + '*vlan': 'int32', + '*id': 'str', + '*name': 'str', + 'type': 'NetClientDriver' } } + +## # @Netdev # # Captures the configuration of a network device. @@ -2515,29 +2538,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.4 -## -{ 'struct': 'NetdevBase', - 'data': { - '*vlan': 'int32', - '*id': 'str', - '*name': 'str', - 'type': 'NetClientDriver' } } - -## # @InetSocketAddress # # Captures a socket address or address range in the Internet namespace.