diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-15 13:24:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-15 13:24:51 +0100 |
| commit | 46bca5404b08201bb9df1ac32bc88fc7e6db1f74 (patch) | |
| tree | d4501d9f7027a6cbe51c3ab828d6f75a8f6d5087 /qapi-schema.json | |
| parent | f3e3b083d4c266ea864ae3c83da49d4086857679 (diff) | |
| parent | 8369e339d24f365750da456588e742674c153437 (diff) | |
| download | qemu-46bca5404b08201bb9df1ac32bc88fc7e6db1f74.zip qemu-46bca5404b08201bb9df1ac32bc88fc7e6db1f74.tar.gz qemu-46bca5404b08201bb9df1ac32bc88fc7e6db1f74.tar.bz2 | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150615' into staging
s390x/kvm/watchdog
1. Implement a diag288 based watchdog
2. Fix virtio-ccw BIOS for gcc >= 4.9
# gpg: Signature made Mon Jun 15 12:36:25 2015 BST using RSA key ID B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
* remotes/borntraeger/tags/s390x-20150615:
s390/bios: build with -fdelete-null-pointer-checks
watchdog: Add new Virtual Watchdog action INJECT-NMI
nmi: Implement inject_nmi() for non-monitor context use
s390x/watchdog: diag288 migration support
s390x/kvm: diag288 instruction interception and handling
s390x/watchdog: introduce diag288 watchdog device
watchdog: change option wording to allow for more watchdogs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index bcc604b..106008c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3746,10 +3746,14 @@ # # @none: nothing is done # +# @inject-nmi: a non-maskable interrupt is injected into the first VCPU (all +# VCPUS on x86) (since 2.4) +# # Since: 2.1 ## { 'enum': 'WatchdogExpirationAction', - 'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none' ] } + 'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none', + 'inject-nmi' ] } ## # @IoOperationType |