OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

QAPI patches patches for 2022-04-05

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmJMGqUSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZT95AP/0kRQuCXINeU80pSPB2bPmZsZqv8klbE
 9KgK+naZvjZKNJ+2b4Dut8wx6zhKjfrA+kQWq31GpEapxIq+ewQuLHljych1P/pw
 KIxW1h71xmrAsqpMWmsFsYon/Qo7UsgU4tTl9MX9rlcanXesTclPLm4IIaI7+Dsr
 weB+OQHqN92AoGhdAbTBEq3FIYYe/FCLW54qRwO9ULFFg22JcwKEY70teKHwv7Tw
 CZsRvsJgQR24JLvaLEO3Da1dFfGgjvgrfFDDC80PaUQBznO/gFtoefzyrTvhYahH
 kz4+IhWNJEdGjasWbp/Nb/2aTHgpR0gNTb6KxBT2KQ/gfFRIHx2jbZT9ODV3KDEX
 4dxXRzKA09y2c5dGSfWlXGyHKUkruxXouJuo6a1KaViUkhytE5WbJVQM1WmkSOyK
 c2FfoXIuQT40yMZk/GDatY1SAztLy7VK2hekvb/hdHOLuDCSGbgDA5xBH/2LtH1h
 h4UcK8XvsC1Zy5dsaxjjH9/2KRZ8faYUjBXWUtCtOL4Yq1CDgwPjdIpmlYsQKkAe
 fePMsWx7QKsTes5zPVUVH2hWBWzRDPLY6lpPhwzVmXcLSuKdUva6Ww2cWxNdz5g0
 bQrMy6EGaznOWjYZ7RX/fDwwXfDMiynHwlAMv4zYhMfl8xD5cCso6nqqnXE08Mwf
 YDYLz3gCQzQW
 =X3H5
 -----END PGP SIGNATURE-----

Merge tag 'pull-qapi-2022-04-05' of git://repo.or.cz/qemu/armbru into staging

QAPI patches patches for 2022-04-05

# gpg: Signature made Tue 05 Apr 2022 11:32:05 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-qapi-2022-04-05' of git://repo.or.cz/qemu/armbru:
  qapi: Fix calc-dirty-rate example
  qapi: fix example of query-memdev command
  qapi: fix example of query-cpus-fast command
  qapi: fix example of trace-event-get-state command
  qapi: fix example of query-colo-status command
  qapi: fix example of query-vnc command
  qapi: fix example of query-spice command
  qapi: fix example of query-named-block-nodes command
  qapi: fix examples: replay-break and replay-seek
  qapi: fix example of netdev_add command

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2022-04-05 14:02:01 +01:00
commit 2e185fb65e
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qapi/block-core.json
View File

@ -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,

4
qapi/machine.json
View File

@ -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
# }
@ -841,6 +839,7 @@
# "merge": false,
# "dump": true,
# "prealloc": false,
# "share": false,
# "host-nodes": [0, 1],
# "policy": "bind"
# },
@ -849,6 +848,7 @@
# "merge": false,
# "dump": true,
# "prealloc": true,
# "share": false,
# "host-nodes": [2, 3],
# "policy": "preferred"
# }

4
qapi/migration.json
View File

@ -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
##
@ -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} }
#
##

2
qapi/net.json
View File

@ -51,7 +51,7 @@
#
# -> { "execute": "netdev_add",
# "arguments": { "type": "user", "id": "netdev1",
# "dnssearch": "example.org" } }
# "dnssearch": [ { "str": "example.org" } ] } }
# <- { "return": {} }
#
##

4
qapi/replay.json
View File

@ -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' } }

2
qapi/trace.json
View File

@ -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',

3
qapi/ui.json
View File

@ -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",
@ -656,6 +658,7 @@
# "host":"127.0.0.1",
# "service":"50401",
# "family":"ipv4"
# "websocket":false,
# }
# ]
# }