diff options
| author | Peter Maydell | 2018-12-19 15:34:17 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-12-19 15:34:17 +0100 |
| commit | adf02c4419e9ac4b3d9a16efdb7e3089c19ae246 (patch) | |
| tree | 64fa9e44b78ec9de53545f2b32f32eec550bcf45 /qapi/misc.json | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-12-1... (diff) | |
| parent | qapi: fix flat union on uncovered branches conditionals (diff) | |
| download | qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.tar.gz qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.tar.xz qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-12-18' into staging
QAPI patches for 2018-12-18
# gpg: Signature made Tue 18 Dec 2018 07:20:11 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2018-12-18:
qapi: fix flat union on uncovered branches conditionals
qmp hmp: Make system_wakeup check wake-up support and run state
qga: update guest-suspend-ram and guest-suspend-hybrid descriptions
qmp: query-current-machine with wakeup-suspend-support
qmp: Split ShutdownCause host-qmp into quit and system-reset
qmp: Add reason to SHUTDOWN and RESET events
qapi: Turn ShutdownCause into QAPI enum
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi/misc.json')
| -rw-r--r-- | qapi/misc.json | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/qapi/misc.json b/qapi/misc.json index 8325e0dc9c..24d20a880a 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1239,12 +1239,18 @@ ## # @system_wakeup: # -# Wakeup guest from suspend. Does nothing in case the guest isn't suspended. +# Wake up guest from suspend. If the guest has wake-up from suspend +# support enabled (wakeup-suspend-support flag from +# query-current-machine), wake-up guest from suspend if the guest is +# in SUSPENDED state. Return an error otherwise. # # Since: 1.1 # # Returns: nothing. # +# Note: prior to 4.0, this command does nothing in case the guest +# isn't suspended. +# # Example: # # -> { "execute": "system_wakeup" } @@ -2013,6 +2019,30 @@ { 'command': 'query-machines', 'returns': ['MachineInfo'] } ## +# @CurrentMachineParams: +# +# Information describing the running machine parameters. +# +# @wakeup-suspend-support: true if the machine supports wake up from +# suspend +# +# Since: 4.0 +## +{ 'struct': 'CurrentMachineParams', + 'data': { 'wakeup-suspend-support': 'bool'} } + +## +# @query-current-machine: +# +# Return information on the current virtual machine. +# +# Returns: CurrentMachineParams +# +# Since: 4.0 +## +{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' } + +## # @CpuDefinitionInfo: # # Virtual CPU definition. |