diff mbox

[v6,14/16] qapi: Use anonymous base in Netdev

Message ID 1450904145-17721-15-git-send-email-eblake@redhat.com
State New
Headers show

Commit Message

Eric Blake Dec. 23, 2015, 8:55 p.m. UTC
Now that the generator supports it, we might as well use an
anonymous base rather than breaking out a single-use NetdevBase
structure.

Signed-off-by: Eric Blake <eblake@redhat.com>

---
v6: new patch
---
 qapi-schema.json | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)
diff mbox

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index a400fa3..ad3030f 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2675,30 +2675,20 @@ 
             'bridge', 'hubport', 'netmap', 'vhost-user' ] }

 ##
-# @NetdevBase
-#
-# Captures the common configuration of a network device.
-#
-# @id: identifier for monitor commands.
-#
-# @type: Specify the driver used for interpreting remaining arguments.
-#
-# Since 1.2
-##
-{ 'struct': 'NetdevBase',
-  'data': { 'id': 'str', 'type': 'NetClientDriver' } }
-
-##
 # @Netdev
 #
 # Captures the configuration of a network device.
 #
+# @id: identifier for monitor commands.
+#
+# @type: Specify the driver used for interpreting remaining arguments.
+#
 # Since 1.2
 #
 # 'l2tpv3' - since 2.1
 ##
 { 'union': 'Netdev',
-  'base': 'NetdevBase',
+  'base': { 'id': 'str', 'type': 'NetClientDriver' },
   'discriminator': 'type',
   'data': {
     'none':     'NetdevNoneOptions',