diff mbox

[v2,07/49] qapi: reorder NetdevBase and Netdev

Message ID 1c03f98d0cb2ed5e29afc27a9096eb32d8482a31.1440171025.git.DirtY.iCE.hu@gmail.com
State New
Headers show

Commit Message

=?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= Aug. 21, 2015, 3:37 p.m. UTC 
Probably more logical if NetdevBase comes before Netdev.
No schematic changes.

Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
---
 qapi-schema.json | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

Comments

Eric Blake Sept. 4, 2015, 11:18 p.m. UTC | #1 
On 08/21/2015 09:37 AM, Kővágó, Zoltán wrote:
> Probably more logical if NetdevBase comes before Netdev.
> No schematic changes.
> 
> Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
> ---
>  qapi-schema.json | 46 +++++++++++++++++++++++-----------------------
>  1 file changed, 23 insertions(+), 23 deletions(-)

Just code motion; doesn't affect generated output or semantics.
Reviewed-by: Eric Blake <eblake@redhat.com>

But does depend on my earlier comments about whether the merge with
NetdevLegacy was right. So it may hit merge conflicts, depending on
where I go with that; in which case dropping the patch altogether may be
easiest.
diff mbox

Patch

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.