aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 15:17:32 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:19:47 +0100
commit9389a4e3ba3bf9115bdec3ca118b42faed311b24 (patch)
tree03d6094905780a915dea69fdac14edf868011876
parent435fcb29067590a38773e00c4caadc7ff6e3eb51 (diff)
downloadqemu-9389a4e3ba3bf9115bdec3ca118b42faed311b24.zip
qemu-9389a4e3ba3bf9115bdec3ca118b42faed311b24.tar.gz
qemu-9389a4e3ba3bf9115bdec3ca118b42faed311b24.tar.bz2
qmp-commands: move 'query-rocker-of-dpa-groups' doc to schema
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--docs/qmp-commands.txt21
-rw-r--r--qapi/rocker.json21
2 files changed, 20 insertions, 22 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 93c8fc2..0c7cf02 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -312,27 +312,6 @@ Example:
-> { "execute": "trace-event-set-state", "arguments": { "name": "qemu_memalign", "enable": "true" } }
<- { "return": {} }
-Show rocker OF-DPA group tables
--------------------------------
-
-Arguments:
-
-- "name": switch name
-- "type": (optional) group type
-
-Example:
-
--> { "execute": "query-rocker-of-dpa-groups", "arguments": { "name": "sw1" } }
-<- { "return": [ {"type": 0, "out-pport": 2, "pport": 2, "vlan-id": 3841,
- "pop-vlan": 1, "id": 251723778},
- {"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3841,
- "pop-vlan": 1, "id": 251723776},
- {"type": 0, "out-pport": 1, "pport": 1, "vlan-id": 3840,
- "pop-vlan": 1, "id": 251658241},
- {"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3840,
- "pop-vlan": 1, "id": 251658240}
- ]}
-
query-gic-capabilities
---------------
diff --git a/qapi/rocker.json b/qapi/rocker.json
index 91746f2..97e2b83 100644
--- a/qapi/rocker.json
+++ b/qapi/rocker.json
@@ -311,9 +311,28 @@
# @type: #optional group type. If type is not specified, returns
# group information for all group types.
#
-# Returns: @Rocker OF-DPA group information
+# Returns: rocker OF-DPA group information
#
# Since: 2.4
+#
+# Example:
+#
+# -> { "execute": "query-rocker-of-dpa-groups",
+# "arguments": { "name": "sw1" } }
+# <- { "return": [ {"type": 0, "out-pport": 2,
+# "pport": 2, "vlan-id": 3841,
+# "pop-vlan": 1, "id": 251723778},
+# {"type": 0, "out-pport": 0,
+# "pport": 0, "vlan-id": 3841,
+# "pop-vlan": 1, "id": 251723776},
+# {"type": 0, "out-pport": 1,
+# "pport": 1, "vlan-id": 3840,
+# "pop-vlan": 1, "id": 251658241},
+# {"type": 0, "out-pport": 0,
+# "pport": 0, "vlan-id": 3840,
+# "pop-vlan": 1, "id": 251658240}
+# ]}
+#
##
{ 'command': 'query-rocker-of-dpa-groups',
'data': { 'name': 'str', '*type': 'uint8' },