summaryrefslogtreecommitdiff
path: root/default-configs
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 /default-configs
parentd7933ef3ac81149a51ba43ddac9fe70405008aba (diff)
downloadqemu-188f24c2c149bcb0088c6317e99e09afc007de34.tar.gz
qemu-188f24c2c149bcb0088c6317e99e09afc007de34.tar.bz2
qemu-188f24c2c149bcb0088c6317e99e09afc007de34.zip
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 'default-configs')
-rw-r--r--default-configs/s390x-softmmu.mak1
1 files changed, 1 insertions, 0 deletions
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index f9e13f177e..36e15de336 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_VIRTIO=y
CONFIG_SCLPCONSOLE=y
CONFIG_S390_FLIC=y
CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
+CONFIG_WDT_DIAG288=y