diff options
| -rw-r--r-- | qapi/acpi.json | 5 | ||||
| -rw-r--r-- | qapi/block-core.json | 14 | ||||
| -rw-r--r-- | qapi/block-export.json | 10 | ||||
| -rw-r--r-- | qapi/dump.json | 9 | ||||
| -rw-r--r-- | qapi/machine.json | 3 | ||||
| -rw-r--r-- | qapi/migration.json | 4 | ||||
| -rw-r--r-- | qapi/net.json | 6 | ||||
| -rw-r--r-- | qapi/pragma.json | 3 | ||||
| -rw-r--r-- | qapi/run-state.json | 16 | ||||
| -rw-r--r-- | qapi/ui.json | 12 |
10 files changed, 49 insertions, 33 deletions
diff --git a/qapi/acpi.json b/qapi/acpi.json index 51f0d55db7..d148f6db9f 100644 --- a/qapi/acpi.json +++ b/qapi/acpi.json @@ -133,8 +133,9 @@ # Example: # # <- { "event": "ACPI_DEVICE_OST", -# "data": { "device": "d1", "slot": "0", -# "slot-type": "DIMM", "source": 1, "status": 0 } } +# "data": { "info": { "device": "d1", "slot": "0", +# "slot-type": "DIMM", "source": 1, "status": 0 } }, +# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # ## { 'event': 'ACPI_DEVICE_OST', diff --git a/qapi/block-core.json b/qapi/block-core.json index e89f2dfb5b..4a7a6940a3 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -5006,10 +5006,9 @@ # Example: # # <- { "event": "BLOCK_IMAGE_CORRUPTED", -# "data": { "device": "ide0-hd0", "node-name": "node0", -# "msg": "Prevented active L1 table overwrite", "offset": 196608, -# "size": 65536 }, -# "timestamp": { "seconds": 1378126126, "microseconds": 966463 } } +# "data": { "device": "", "node-name": "drive", "fatal": false, +# "msg": "L2 table offset 0x2a2a2a00 unaligned (L1 index: 0)" }, +# "timestamp": { "seconds": 1648243240, "microseconds": 906060 } } # # Since: 1.7 ## @@ -5059,7 +5058,8 @@ # "data": { "device": "ide0-hd1", # "node-name": "#block212", # "operation": "write", -# "action": "stop" }, +# "action": "stop", +# "reason": "No space left on device" }, # "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # ## @@ -5225,8 +5225,8 @@ # # Example: # -# <- { "event": "BLOCK_JOB_WAITING", -# "data": { "device": "drive0", "type": "mirror" }, +# <- { "event": "BLOCK_JOB_PENDING", +# "data": { "type": "mirror", "id": "backup_1" }, # "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # ## diff --git a/qapi/block-export.json b/qapi/block-export.json index f183522d0d..1e34927f85 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -219,13 +219,13 @@ # # @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. -# Remove export after all clients are disconnected. +# hide: Just hide export from new clients, leave existing connections as is. +# Remove export after all clients are disconnected. # -# soft: Hide export from new clients, answer with ESHUTDOWN for all further -# requests from existing clients. +# soft: Hide export from new clients, answer with ESHUTDOWN for all further +# requests from existing clients. # # Since: 2.12 ## diff --git a/qapi/dump.json b/qapi/dump.json index f7c4267e3f..29441af9d8 100644 --- a/qapi/dump.json +++ b/qapi/dump.json @@ -83,7 +83,7 @@ # Example: # # -> { "execute": "dump-guest-memory", -# "arguments": { "protocol": "fd:dump" } } +# "arguments": { "paging": false, "protocol": "fd:dump" } } # <- { "return": {} } # ## @@ -161,9 +161,10 @@ # # Example: # -# { "event": "DUMP_COMPLETED", -# "data": {"result": {"total": 1090650112, "status": "completed", -# "completed": 1090650112} } } +# <- { "event": "DUMP_COMPLETED", +# "data": { "result": { "total": 1090650112, "status": "completed", +# "completed": 1090650112 } }, +# "timestamp": { "seconds": 1648244171, "microseconds": 950316 } } # ## { 'event': 'DUMP_COMPLETED' , diff --git a/qapi/machine.json b/qapi/machine.json index 42fc68403d..9c460ec450 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1356,7 +1356,8 @@ # Example: # # <- { "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 } } # ## diff --git a/qapi/migration.json b/qapi/migration.json index 18e2610e88..092a63354b 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1736,7 +1736,9 @@ # Since: 4.2 # # Example: -# {"event": "UNPLUG_PRIMARY", "data": {"device-id": "hostdev0"} } +# <- { "event": "UNPLUG_PRIMARY", +# "data": { "device-id": "hostdev0" }, +# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # ## { 'event': 'UNPLUG_PRIMARY', diff --git a/qapi/net.json b/qapi/net.json index 7fab2e7cd8..0d4578bd07 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -685,13 +685,15 @@ # Failover primary devices which were hidden (not hotplugged when requested) # 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 # # Example: # # <- { "event": "FAILOVER_NEGOTIATED", -# "data": "net1" } +# "data": { "device-id": "net1" }, +# "timestamp": { "seconds": 1368697518, "microseconds": 326866 } } # ## { 'event': 'FAILOVER_NEGOTIATED', diff --git a/qapi/pragma.json b/qapi/pragma.json index 3bc0335d1f..e6a021c19c 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json @@ -1,3 +1,6 @@ +# -*- Mode: Python -*- +# vim: filetype=python + { 'pragma': { 'doc-required': true } } # Whitelists to permit QAPI rule violations; think twice before you diff --git a/qapi/run-state.json b/qapi/run-state.json index 43d66d700f..8124220bd9 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -150,7 +150,8 @@ # # Example: # -# <- { "event": "SHUTDOWN", "data": { "guest": true }, +# <- { "event": "SHUTDOWN", +# "data": { "guest": true, "reason": "guest-shutdown" }, # "timestamp": { "seconds": 1267040730, "microseconds": 682951 } } # ## @@ -188,7 +189,8 @@ # # Example: # -# <- { "event": "RESET", "data": { "guest": false }, +# <- { "event": "RESET", +# "data": { "guest": false, "reason": "guest-reset" }, # "timestamp": { "seconds": 1267041653, "microseconds": 9518 } } # ## @@ -424,7 +426,8 @@ # Example: # # <- { "event": "GUEST_PANICKED", -# "data": { "action": "pause" } } +# "data": { "action": "pause" }, +# "timestamp": { "seconds": 1648245231, "microseconds": 900001 } } # ## { 'event': 'GUEST_PANICKED', @@ -444,7 +447,8 @@ # Example: # # <- { "event": "GUEST_CRASHLOADED", -# "data": { "action": "run" } } +# "data": { "action": "run" }, +# "timestamp": { "seconds": 1648245259, "microseconds": 893771 } } # ## { 'event': 'GUEST_CRASHLOADED', @@ -567,7 +571,9 @@ # <- { "event": "MEMORY_FAILURE", # "data": { "recipient": "hypervisor", # "action": "fatal", -# "flags": { 'action-required': false } } +# "flags": { "action-required": false, +# "recursive": false } }, +# "timestamp": { "seconds": 1267061043, "microseconds": 959568 } } # ## { 'event': 'MEMORY_FAILURE', diff --git a/qapi/ui.json b/qapi/ui.json index 664da9e462..a810ed680c 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -710,10 +710,10 @@ # # <- { "event": "VNC_CONNECTED", # "data": { -# "server": { "auth": "sasl", "family": "ipv4", +# "server": { "auth": "sasl", "family": "ipv4", "websocket": false, # "service": "5901", "host": "0.0.0.0" }, # "client": { "family": "ipv4", "service": "58425", -# "host": "127.0.0.1" } }, +# "host": "127.0.0.1", "websocket": false } }, # "timestamp": { "seconds": 1262976601, "microseconds": 975795 } } # ## @@ -738,9 +738,9 @@ # # <- { "event": "VNC_INITIALIZED", # "data": { -# "server": { "auth": "sasl", "family": "ipv4", +# "server": { "auth": "sasl", "family": "ipv4", "websocket": false, # "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" } }, # "timestamp": { "seconds": 1263475302, "microseconds": 150772 } } # @@ -765,9 +765,9 @@ # # <- { "event": "VNC_DISCONNECTED", # "data": { -# "server": { "auth": "sasl", "family": "ipv4", +# "server": { "auth": "sasl", "family": "ipv4", "websocket": false, # "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" } }, # "timestamp": { "seconds": 1262976601, "microseconds": 975795 } } # |