diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-12-19 14:34:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-12-19 14:34:17 +0000 |
| commit | adf02c4419e9ac4b3d9a16efdb7e3089c19ae246 (patch) | |
| tree | 64fa9e44b78ec9de53545f2b32f32eec550bcf45 /tests/qemu-iotests/191.out | |
| parent | e85c577158a2e8e252414959da9ef15c12eec63d (diff) | |
| parent | ce1a1aec47877a281d69dbc2e65f86bfe8fea231 (diff) | |
| download | qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.zip qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.tar.gz qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.tar.bz2 | |
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 'tests/qemu-iotests/191.out')
| -rw-r--r-- | tests/qemu-iotests/191.out | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out index 31a0c7d..a513ccc 100644 --- a/tests/qemu-iotests/191.out +++ b/tests/qemu-iotests/191.out @@ -389,7 +389,8 @@ wrote 65536/65536 bytes at offset 1048576 }, "event": "SHUTDOWN", "data": { - "guest": false + "guest": false, + "reason": "host-qmp-quit" } } image: TEST_DIR/t.IMGFMT @@ -806,7 +807,8 @@ wrote 65536/65536 bytes at offset 1048576 }, "event": "SHUTDOWN", "data": { - "guest": false + "guest": false, + "reason": "host-qmp-quit" } } image: TEST_DIR/t.IMGFMT |