watchdog/diag288: correctly register for system reset requests

The diag288 watchdog is no sysbus device, therefore it doesn't get
triggered on resets automatically using dc->reset.

Let's register the reset handler manually, so we get correctly notified
again when a system reset was requested. Also reset the watchdog on
subsystem resets that don't trigger a full system reset.

Signed-off-by: Xu Wang <gesaint@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Xu Wang 2015-06-29 08:21:10 +02:00 committed by Cornelia Huck
parent 0030ff4047
commit 0c7322cfd3
2 changed files with 13 additions and 1 deletions

View file

@ -36,7 +36,7 @@ typedef struct S390CcwMachineState {
void io_subsystem_reset(void)
{
DeviceState *css, *sclp, *flic;
DeviceState *css, *sclp, *flic, *diag288;
css = DEVICE(object_resolve_path_type("", "virtual-css-bridge", NULL));
if (css) {
@ -51,6 +51,10 @@ void io_subsystem_reset(void)
if (flic) {
qdev_reset_all(flic);
}
diag288 = DEVICE(object_resolve_path_type("", "diag288", NULL));
if (diag288) {
qdev_reset_all(diag288);
}
}
static int virtio_ccw_hcall_notify(const uint64_t *args)