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

QAPI patches patches for 2022-03-31

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmJFh7YSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZT3ZQP/iq84QK73VCvCELHdjQ5mlL+u5SF1CUr
 6LQN8hTlIl/4sklJFRvnOcUEuBpTXtMK1+Wb4BxKzQTmq35USzLPkzuHM6Klvm3J
 ssAybG0C++5Wduu2qJPbOCqsypkyuaLfmW+e5CLwkJ11ZXsuRxvyDIsegxIddlxe
 m/1KiP8L5+XuqaLwddz3+IDf0PsUmOXRqMa7X4QdWFh4qp3SioImFfdo4VVBW4pL
 mpORrBoSDpOdFhSFNx36oegN2jASR6QOfLwspjnL0JZRf61K48pZmsRpglk5/CEx
 GlQkMTbPdY9TfGZeJgG2uIUG0N04jO9zHJFyWLwRVkfD3qbJSEgCXv21HNcDcuTG
 ilk5G9xt0xD/9uC0QfqwDm3uFijdr2Gna5l6Pri3ABookcQkCepY/K0naRVP7ghs
 9RGoe8vo3o2fnwbrH4IpuPZSJA1hSSidrnODK3EohY7Uph7zWveUB0ByPOsQfkVv
 h2lHpqW+5Hs9eSdvHSvf5ydzOcQSF+ZMvGnrtSbfdovNdNUEPwzEvTbLDbcZa2Gr
 vb95FpMgkE/YhV9Yd5OWYG7C/1YJPzRJCeRQQJBSE+zIMnELQLokP38yJLQYsKi1
 oUnqgDRJN9jsJuOo5KXWRjD0AYX37uuci9ZlyMLTpCSoubOsU3khmd0echm+lTpb
 AdeJ07q/HSkV
 =UtdQ
 -----END PGP SIGNATURE-----

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

QAPI patches patches for 2022-03-31

# gpg: Signature made Thu 31 Mar 2022 11:51:34 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-03-31' of git://repo.or.cz/qemu/armbru:
  qapi: fix example of dump-guest-memory
  qapi: fix example of ACPI_DEVICE_OST event
  qapi: ui examples: add missing @websocket member
  qapi: fix example of MEMORY_FAILURE
  qapi: run-state examples: add missing @timestamp
  qapi: fix examples: SHUTDOWN and RESET events
  qapi: fix example of FAILOVER_NEGOTIATED event
  qapi: fix example of UNPLUG_PRIMARY event
  qapi: fix example of MEMORY_DEVICE_SIZE_CHANGE event
  qapi: fix example of DUMP_COMPLETED event
  qapi: fix example of BLOCK_JOB_PENDING event
  qapi: fix example of BLOCK_IO_ERROR event
  qapi: fix example of BLOCK_IMAGE_CORRUPTED event
  qapi: BlockExportRemoveMode: move comments to TODO
  schemas: add missing vim modeline

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2022-03-31 11:56:52 +01:00
commit cace6c6f3a
10 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qapi/acpi.json
View File

@ -133,8 +133,9 @@
# Example: # Example:
# #
# <- { "event": "ACPI_DEVICE_OST", # <- { "event": "ACPI_DEVICE_OST",
# "data": { "device": "d1", "slot": "0", # "data": { "info": { "device": "d1", "slot": "0",
# "slot-type": "DIMM", "source": 1, "status": 0 } } # "slot-type": "DIMM", "source": 1, "status": 0 } },
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
# #
## ##
{ 'event': 'ACPI_DEVICE_OST', { 'event': 'ACPI_DEVICE_OST',

14
qapi/block-core.json
View File

@ -5006,10 +5006,9 @@
# Example: # Example:
# #
# <- { "event": "BLOCK_IMAGE_CORRUPTED", # <- { "event": "BLOCK_IMAGE_CORRUPTED",
# "data": { "device": "ide0-hd0", "node-name": "node0", # "data": { "device": "", "node-name": "drive", "fatal": false,
# "msg": "Prevented active L1 table overwrite", "offset": 196608, # "msg": "L2 table offset 0x2a2a2a00 unaligned (L1 index: 0)" },
# "size": 65536 }, # "timestamp": { "seconds": 1648243240, "microseconds": 906060 } }
# "timestamp": { "seconds": 1378126126, "microseconds": 966463 } }
# #
# Since: 1.7 # Since: 1.7
## ##
@ -5059,7 +5058,8 @@
# "data": { "device": "ide0-hd1", # "data": { "device": "ide0-hd1",
# "node-name": "#block212", # "node-name": "#block212",
# "operation": "write", # "operation": "write",
# "action": "stop" }, # "action": "stop",
# "reason": "No space left on device" },
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
# #
## ##
@ -5225,8 +5225,8 @@
# #
# Example: # Example:
# #
# <- { "event": "BLOCK_JOB_WAITING", # <- { "event": "BLOCK_JOB_PENDING",
# "data": { "device": "drive0", "type": "mirror" }, # "data": { "type": "mirror", "id": "backup_1" },
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
# #
## ##

10
qapi/block-export.json
View File

@ -219,13 +219,13 @@
# #
# @hard: Drop all connections immediately and remove export. # @hard: Drop all connections immediately and remove export.
# #
# Potential additional modes to be added in the future: # TODO: Potential additional modes to be added in the future:
# #
# hide: Just hide export from new clients, leave existing connections as is. # hide: Just hide export from new clients, leave existing connections as is.
# Remove export after all clients are disconnected. # Remove export after all clients are disconnected.
# #
# soft: Hide export from new clients, answer with ESHUTDOWN for all further # soft: Hide export from new clients, answer with ESHUTDOWN for all further
# requests from existing clients. # requests from existing clients.
# #
# Since: 2.12 # Since: 2.12
## ##

9
qapi/dump.json
View File

@ -83,7 +83,7 @@
# Example: # Example:
# #
# -> { "execute": "dump-guest-memory", # -> { "execute": "dump-guest-memory",
# "arguments": { "protocol": "fd:dump" } } # "arguments": { "paging": false, "protocol": "fd:dump" } }
# <- { "return": {} } # <- { "return": {} }
# #
## ##
@ -161,9 +161,10 @@
# #
# Example: # Example:
# #
# { "event": "DUMP_COMPLETED", # <- { "event": "DUMP_COMPLETED",
# "data": {"result": {"total": 1090650112, "status": "completed", # "data": { "result": { "total": 1090650112, "status": "completed",
# "completed": 1090650112} } } # "completed": 1090650112 } },
# "timestamp": { "seconds": 1648244171, "microseconds": 950316 } }
# #
## ##
{ 'event': 'DUMP_COMPLETED' , { 'event': 'DUMP_COMPLETED' ,

3
qapi/machine.json
View File

@ -1356,7 +1356,8 @@
# Example: # Example:
# #
# <- { "event": "MEMORY_DEVICE_SIZE_CHANGE", # <- { "event": "MEMORY_DEVICE_SIZE_CHANGE",
# "data": { "id": "vm0", "size": 1073741824}, # "data": { "id": "vm0", "size": 1073741824,
# "qom-path": "/machine/unattached/device[2]" },
# "timestamp": { "seconds": 1588168529, "microseconds": 201316 } } # "timestamp": { "seconds": 1588168529, "microseconds": 201316 } }
# #
## ##

4
qapi/migration.json
View File

@ -1736,7 +1736,9 @@
# Since: 4.2 # Since: 4.2
# #
# Example: # Example:
# {"event": "UNPLUG_PRIMARY", "data": {"device-id": "hostdev0"} } # <- { "event": "UNPLUG_PRIMARY",
# "data": { "device-id": "hostdev0" },
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
# #
## ##
{ 'event': 'UNPLUG_PRIMARY', { 'event': 'UNPLUG_PRIMARY',

6
qapi/net.json
View File

@ -685,13 +685,15 @@
# Failover primary devices which were hidden (not hotplugged when requested) # Failover primary devices which were hidden (not hotplugged when requested)
# before will now be hotplugged by the virtio-net standby device. # before will now be hotplugged by the virtio-net standby device.
# #
# device-id: QEMU device id of the unplugged device # @device-id: QEMU device id of the unplugged device
#
# Since: 4.2 # Since: 4.2
# #
# Example: # Example:
# #
# <- { "event": "FAILOVER_NEGOTIATED", # <- { "event": "FAILOVER_NEGOTIATED",
# "data": "net1" } # "data": { "device-id": "net1" },
# "timestamp": { "seconds": 1368697518, "microseconds": 326866 } }
# #
## ##
{ 'event': 'FAILOVER_NEGOTIATED', { 'event': 'FAILOVER_NEGOTIATED',

3
qapi/pragma.json
View File

@ -1,3 +1,6 @@
# -*- Mode: Python -*-
# vim: filetype=python
{ 'pragma': { 'doc-required': true } } { 'pragma': { 'doc-required': true } }
# Whitelists to permit QAPI rule violations; think twice before you # Whitelists to permit QAPI rule violations; think twice before you

16
qapi/run-state.json
View File

@ -150,7 +150,8 @@
# #
# Example: # Example:
# #
# <- { "event": "SHUTDOWN", "data": { "guest": true }, # <- { "event": "SHUTDOWN",
# "data": { "guest": true, "reason": "guest-shutdown" },
# "timestamp": { "seconds": 1267040730, "microseconds": 682951 } } # "timestamp": { "seconds": 1267040730, "microseconds": 682951 } }
# #
## ##
@ -188,7 +189,8 @@
# #
# Example: # Example:
# #
# <- { "event": "RESET", "data": { "guest": false }, # <- { "event": "RESET",
# "data": { "guest": false, "reason": "guest-reset" },
# "timestamp": { "seconds": 1267041653, "microseconds": 9518 } } # "timestamp": { "seconds": 1267041653, "microseconds": 9518 } }
# #
## ##
@ -424,7 +426,8 @@
# Example: # Example:
# #
# <- { "event": "GUEST_PANICKED", # <- { "event": "GUEST_PANICKED",
# "data": { "action": "pause" } } # "data": { "action": "pause" },
# "timestamp": { "seconds": 1648245231, "microseconds": 900001 } }
# #
## ##
{ 'event': 'GUEST_PANICKED', { 'event': 'GUEST_PANICKED',
@ -444,7 +447,8 @@
# Example: # Example:
# #
# <- { "event": "GUEST_CRASHLOADED", # <- { "event": "GUEST_CRASHLOADED",
# "data": { "action": "run" } } # "data": { "action": "run" },
# "timestamp": { "seconds": 1648245259, "microseconds": 893771 } }
# #
## ##
{ 'event': 'GUEST_CRASHLOADED', { 'event': 'GUEST_CRASHLOADED',
@ -567,7 +571,9 @@
# <- { "event": "MEMORY_FAILURE", # <- { "event": "MEMORY_FAILURE",
# "data": { "recipient": "hypervisor", # "data": { "recipient": "hypervisor",
# "action": "fatal", # "action": "fatal",
# "flags": { 'action-required': false } } # "flags": { "action-required": false,
# "recursive": false } },
# "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
# #
## ##
{ 'event': 'MEMORY_FAILURE', { 'event': 'MEMORY_FAILURE',

12
qapi/ui.json
View File

@ -710,10 +710,10 @@
# #
# <- { "event": "VNC_CONNECTED", # <- { "event": "VNC_CONNECTED",
# "data": { # "data": {
# "server": { "auth": "sasl", "family": "ipv4", # "server": { "auth": "sasl", "family": "ipv4", "websocket": false,
# "service": "5901", "host": "0.0.0.0" }, # "service": "5901", "host": "0.0.0.0" },
# "client": { "family": "ipv4", "service": "58425", # "client": { "family": "ipv4", "service": "58425",
# "host": "127.0.0.1" } }, # "host": "127.0.0.1", "websocket": false } },
# "timestamp": { "seconds": 1262976601, "microseconds": 975795 } } # "timestamp": { "seconds": 1262976601, "microseconds": 975795 } }
# #
## ##
@ -738,9 +738,9 @@
# #
# <- { "event": "VNC_INITIALIZED", # <- { "event": "VNC_INITIALIZED",
# "data": { # "data": {
# "server": { "auth": "sasl", "family": "ipv4", # "server": { "auth": "sasl", "family": "ipv4", "websocket": false,
# "service": "5901", "host": "0.0.0.0"}, # "service": "5901", "host": "0.0.0.0"},
# "client": { "family": "ipv4", "service": "46089", # "client": { "family": "ipv4", "service": "46089", "websocket": false,
# "host": "127.0.0.1", "sasl_username": "luiz" } }, # "host": "127.0.0.1", "sasl_username": "luiz" } },
# "timestamp": { "seconds": 1263475302, "microseconds": 150772 } } # "timestamp": { "seconds": 1263475302, "microseconds": 150772 } }
# #
@ -765,9 +765,9 @@
# #
# <- { "event": "VNC_DISCONNECTED", # <- { "event": "VNC_DISCONNECTED",
# "data": { # "data": {
# "server": { "auth": "sasl", "family": "ipv4", # "server": { "auth": "sasl", "family": "ipv4", "websocket": false,
# "service": "5901", "host": "0.0.0.0" }, # "service": "5901", "host": "0.0.0.0" },
# "client": { "family": "ipv4", "service": "58425", # "client": { "family": "ipv4", "service": "58425", "websocket": false,
# "host": "127.0.0.1", "sasl_username": "luiz" } }, # "host": "127.0.0.1", "sasl_username": "luiz" } },
# "timestamp": { "seconds": 1262976601, "microseconds": 975795 } } # "timestamp": { "seconds": 1262976601, "microseconds": 975795 } }
# #