Merge remote-tracking branch 'qmp/queue/qmp' into staging

[mirror_qemu.git] / qapi-schema.json

diff --git a/qapi-schema.json b/qapi-schema.json
index b58f5cded8ca2f19bf71b1dd344e11a95b1b33b7..cddf63a878ead6e25456466c11a85e2e80fff7c0 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2096,6 +2096,19 @@
     '*br':     'str',
     '*helper': 'str' } }
 
+##
+# @NetdevHubPortOptions
+#
+# Connect two or more net clients through a software hub.
+#
+# @hubid: hub identifier number
+#
+# Since 1.2
+##
+{ 'type': 'NetdevHubPortOptions',
+  'data': {
+    'hubid':     'int32' } }
+
 ##
 # @NetClientOptions
 #
@@ -2105,14 +2118,15 @@
 ##
 { 'union': 'NetClientOptions',
   'data': {
-    'none':   'NetdevNoneOptions',
-    'nic':    'NetLegacyNicOptions',
-    'user':   'NetdevUserOptions',
-    'tap':    'NetdevTapOptions',
-    'socket': 'NetdevSocketOptions',
-    'vde':    'NetdevVdeOptions',
-    'dump':   'NetdevDumpOptions',
-    'bridge': 'NetdevBridgeOptions' } }
+    'none':     'NetdevNoneOptions',
+    'nic':      'NetLegacyNicOptions',
+    'user':     'NetdevUserOptions',
+    'tap':      'NetdevTapOptions',
+    'socket':   'NetdevSocketOptions',
+    'vde':      'NetdevVdeOptions',
+    'dump':     'NetdevDumpOptions',
+    'bridge':   'NetdevBridgeOptions',
+    'hubport':  'NetdevHubPortOptions' } }
 
 ##
 # @NetLegacy