aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorXu Wang <gesaint@linux.vnet.ibm.com>2015-02-05 18:28:32 +0800
committerChristian Borntraeger <borntraeger@de.ibm.com>2015-06-11 17:45:49 +0200
commit188f24c2c149bcb0088c6317e99e09afc007de34 (patch)
tree6d6e9ad12085b657dcf72647f1cafa528e21a03d /qemu-options.hx
parentd7933ef3ac81149a51ba43ddac9fe70405008aba (diff)
downloadqemu-arm-188f24c2c149bcb0088c6317e99e09afc007de34.tar.gz
s390x/watchdog: introduce diag288 watchdog device
This patch introduces a new diag288 watchdog device that will, just like other watchdogs, monitor a guest and take corresponding actions when it detects that the guest is not responding. diag288 is s390x specific. The wiring to s390x KVM will be done in separate patches. Signed-off-by: Xu Wang <gesaint@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [split out qemu-option.hx base changes]
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx3
1 files changed, 3 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index a295c0f82b..d31fe35cae 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3174,6 +3174,9 @@ iBASE 700 is a very simple ISA watchdog with a single timer.
@item i6300esb
Intel 6300ESB I/O controller hub is a much more featureful PCI-based
dual-timer watchdog.
+@item diag288
+A virtual watchdog for s390x backed by the diagnose 288 hypercall
+(currently KVM only).
@end table
ETEXI