[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.4 2/2] watchdog/diag288: handle subsystem rese
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.4 2/2] watchdog/diag288: handle subsystem resets correctly |
Date: |
Thu, 9 Jul 2015 18:51:32 +0200 |
From: Xu Wang <address@hidden>
Remember to reset the watchdog on subsystem resets that don't trigger
a full system reset.
[CH: adapted to resets of bus-less devices now being handled in core]
Signed-off-by: Xu Wang <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 3d20d6a..4c51d1a 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -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)
--
2.3.8
- [Qemu-devel] [PATCH for-2.4 0/2] reset for bus-less devices, Cornelia Huck, 2015/07/09
- [Qemu-devel] [PATCH for-2.4 2/2] watchdog/diag288: handle subsystem resets correctly,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.4 1/2] core: reset handler for bus-less devices, Cornelia Huck, 2015/07/09
- Re: [Qemu-devel] [PATCH for-2.4 1/2] core: reset handler for bus-less devices, Christian Borntraeger, 2015/07/13
- Re: [Qemu-devel] [PATCH for-2.4 1/2] core: reset handler for bus-less devices, Cornelia Huck, 2015/07/13
- Re: [Qemu-devel] [PATCH for-2.4 1/2] core: reset handler for bus-less devices, Andreas Färber, 2015/07/13
- Re: [Qemu-devel] [PATCH for-2.4 1/2] core: reset handler for bus-less devices, Christian Borntraeger, 2015/07/13
- Re: [Qemu-devel] [PATCH for-2.4 1/2] core: reset handler for bus-less devices, Andreas Färber, 2015/07/13
- Re: [Qemu-devel] [PATCH for-2.4 1/2] core: reset handler for bus-less devices, Cornelia Huck, 2015/07/13