From 9a9d101c5bd21fb2b4b8b06f66e3fde57e7b5dd7 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Fri, 1 Apr 2022 13:07:12 +0200 Subject: [PATCH 01/10] qapi: fix example of netdev_add command Example output has the optional member @dnssearch as string type. It should be an array of String objects instead. Fix it. For reference, see NetdevUserOptions. Signed-off-by: Victor Toso Message-Id: <20220401110712.26911-1-victortoso@redhat.com> Reviewed-by: Markus Armbruster [Commit message tweaked for precision] Signed-off-by: Markus Armbruster --- qapi/net.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/net.json b/qapi/net.json index 0d4578bd07..b92f3f5fb4 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -51,7 +51,7 @@ # # -> { "execute": "netdev_add", # "arguments": { "type": "user", "id": "netdev1", -# "dnssearch": "example.org" } } +# "dnssearch": [ { "str": "example.org" } ] } } # <- { "return": {} } # ## From 227a762bef7d09d013199d98de8c411c4004fa7b Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:26 +0200 Subject: [PATCH 02/10] qapi: fix examples: replay-break and replay-seek Both examples outputs are using @data member for the arguments. This is wrong. The expected member for the QMP is @arguments. Fix it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-3-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/replay.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qapi/replay.json b/qapi/replay.json index b4d1ba253b..351898f60d 100644 --- a/qapi/replay.json +++ b/qapi/replay.json @@ -81,7 +81,7 @@ # # Example: # -# -> { "execute": "replay-break", "data": { "icount": 220414 } } +# -> { "execute": "replay-break", "arguments": { "icount": 220414 } } # ## { 'command': 'replay-break', 'data': { 'icount': 'int' } } @@ -117,6 +117,6 @@ # # Example: # -# -> { "execute": "replay-seek", "data": { "icount": 220414 } } +# -> { "execute": "replay-seek", "arguments": { "icount": 220414 } } ## { 'command': 'replay-seek', 'data': { 'icount': 'int' } } From 016b835949ac2e3e3333a8d67f9205091d45e4c2 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:27 +0200 Subject: [PATCH 03/10] qapi: fix example of query-named-block-nodes command Example output is missing mandatory member @detect_zeroes. Fix it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-4-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/block-core.json | 1 + 1 file changed, 1 insertion(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index 4a7a6940a3..beeb91952a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1776,6 +1776,7 @@ # "file":"disks/test.qcow2", # "node-name": "my-node", # "backing_file_depth":1, +# "detect_zeroes":"off", # "bps":1000000, # "bps_rd":0, # "bps_wr":0, From 74dd52e556a4d0c0e20c30ab608916f370a8775f Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:28 +0200 Subject: [PATCH 04/10] qapi: fix example of query-spice command Example output is missing mandatory members @migrated and @mouse-mode. Fix it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-5-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/ui.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qapi/ui.json b/qapi/ui.json index a810ed680c..c039b8b3cb 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -324,8 +324,10 @@ # "enabled": true, # "auth": "spice", # "port": 5920, +# "migrated":false, # "tls-port": 5921, # "host": "0.0.0.0", +# "mouse-mode":"client", # "channels": [ # { # "port": "54924", From c7f4a0fc785b69f0a87f79d2eb87c480aad44855 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:29 +0200 Subject: [PATCH 05/10] qapi: fix example of query-vnc command The return value is missing the mandatory member @websocket. Fix it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-6-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/ui.json | 1 + 1 file changed, 1 insertion(+) diff --git a/qapi/ui.json b/qapi/ui.json index c039b8b3cb..13a8bb82aa 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -658,6 +658,7 @@ # "host":"127.0.0.1", # "service":"50401", # "family":"ipv4" +# "websocket":false, # } # ] # } From 51ec294d8ea7634a3b267701a66efdef5b23b470 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:30 +0200 Subject: [PATCH 06/10] qapi: fix example of query-colo-status command The example output is missing the mandatory member @last-mode in the return value. Fix it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-7-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/migration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/migration.json b/qapi/migration.json index 092a63354b..f74777608a 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1679,7 +1679,7 @@ # Example: # # -> { "execute": "query-colo-status" } -# <- { "return": { "mode": "primary", "reason": "request" } } +# <- { "return": { "mode": "primary", "last-mode": "none", "reason": "request" } } # # Since: 3.1 ## From 6352c81b249d2e67e39516816c0e95b6b4508029 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:31 +0200 Subject: [PATCH 07/10] qapi: fix example of trace-event-get-state command The example output is missing the mandatory member @vcpu. Fix it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-8-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/trace.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/trace.json b/qapi/trace.json index 119509f565..6c6982a587 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -69,7 +69,7 @@ # # -> { "execute": "trace-event-get-state", # "arguments": { "name": "qemu_memalign" } } -# <- { "return": [ { "name": "qemu_memalign", "state": "disabled" } ] } +# <- { "return": [ { "name": "qemu_memalign", "state": "disabled", "vcpu": false } ] } # ## { 'command': 'trace-event-get-state', From 28c1ec60aa65bb4c8d6ea97b941237fd8e87de0f Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:32 +0200 Subject: [PATCH 08/10] qapi: fix example of query-cpus-fast command Example output contains member @arch that was removed in 445a5b4087 "machine: remove 'arch' field from 'query-cpus-fast' QMP command". Fix it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-9-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/machine.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/qapi/machine.json b/qapi/machine.json index 9c460ec450..968f912989 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -109,7 +109,6 @@ # "socket-id": 0 # }, # "qom-path": "/machine/unattached/device[0]", -# "arch":"x86", # "target":"x86_64", # "cpu-index": 0 # }, @@ -121,7 +120,6 @@ # "socket-id": 1 # }, # "qom-path": "/machine/unattached/device[2]", -# "arch":"x86", # "target":"x86_64", # "cpu-index": 1 # } From 7c90031d8057b8c539b75d96adb23ac78d00c149 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 31 Mar 2022 21:06:33 +0200 Subject: [PATCH 09/10] qapi: fix example of query-memdev command Example output is missing mandatory argument @share for the return JSON object. Add it. Signed-off-by: Victor Toso Message-Id: <20220331190633.121077-10-victortoso@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/machine.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qapi/machine.json b/qapi/machine.json index 968f912989..d25a481ce4 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -839,6 +839,7 @@ # "merge": false, # "dump": true, # "prealloc": false, +# "share": false, # "host-nodes": [0, 1], # "policy": "bind" # }, @@ -847,6 +848,7 @@ # "merge": false, # "dump": true, # "prealloc": true, +# "share": false, # "host-nodes": [2, 3], # "policy": "preferred" # } From 8230f3389c7d7215d0c3946d415f54b3e9c07f73 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 1 Apr 2022 10:20:28 +0200 Subject: [PATCH 10/10] qapi: Fix calc-dirty-rate example The example shows {"command": ...}, which is wrong. Fix it to {"execute": ...}. Signed-off-by: Markus Armbruster Message-Id: <20220401082028.3583296-1-armbru@redhat.com> Reviewed-by: Victor Toso --- qapi/migration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/migration.json b/qapi/migration.json index f74777608a..27d7b28158 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1845,7 +1845,7 @@ # Since: 5.2 # # Example: -# {"command": "calc-dirty-rate", "arguments": {"calc-time": 1, +# {"execute": "calc-dirty-rate", "arguments": {"calc-time": 1, # 'sample-pages': 512} } # ##