From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCkBr-0007GM-5z for qemu-devel@nongnu.org; Wed, 08 Jul 2015 03:54:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCkBn-00038e-PR for qemu-devel@nongnu.org; Wed, 08 Jul 2015 03:54:47 -0400 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:35930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCkBn-00037H-HF for qemu-devel@nongnu.org; Wed, 08 Jul 2015 03:54:43 -0400 Received: by wgxm20 with SMTP id m20so4702963wgx.3 for ; Wed, 08 Jul 2015 00:54:42 -0700 (PDT) Sender: Paolo Bonzini References: <1436259202-20509-1-git-send-email-cornelia.huck@de.ibm.com> <1436259202-20509-2-git-send-email-cornelia.huck@de.ibm.com> From: Paolo Bonzini Message-ID: <559CD740.1020201@redhat.com> Date: Wed, 8 Jul 2015 09:54:40 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for-2.4] watchdog/diag288: correctly register for system reset requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite , Cornelia Huck Cc: "Christian Borntraeger (s390x)" , jfrei@linux.vnet.ibm.com, "qemu-devel@nongnu.org Developers" , Alexander Graf , Xu Wang On 07/07/2015 12:51, Peter Crosthwaite wrote: > On Tue, Jul 7, 2015 at 1:53 AM, Cornelia Huck wrote: >> From: Xu Wang >> >> 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 >> Reviewed-by: David Hildenbrand >> Signed-off-by: Cornelia Huck >> --- >> hw/s390x/s390-virtio-ccw.c | 6 +++++- >> hw/watchdog/wdt_diag288.c | 8 ++++++++ >> 2 files changed, 13 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) >> diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c >> index 1185e06..2a885a4 100644 >> --- a/hw/watchdog/wdt_diag288.c >> +++ b/hw/watchdog/wdt_diag288.c >> @@ -40,6 +40,13 @@ static void wdt_diag288_reset(DeviceState *dev) >> timer_del(diag288->timer); >> } >> >> +static void diag288_reset(void *opaque) >> +{ >> + DeviceState *diag288 = opaque; >> + >> + wdt_diag288_reset(diag288); >> +} >> + >> static void diag288_timer_expired(void *dev) >> { >> qemu_log_mask(CPU_LOG_RESET, "Watchdog timer expired.\n"); >> @@ -80,6 +87,7 @@ static void wdt_diag288_realize(DeviceState *dev, Error **errp) >> { >> DIAG288State *diag288 = DIAG288(dev); >> >> + qemu_register_reset(diag288_reset, diag288); > > Doesn't seem right. Even if it is not a SBD it should still sit in the > QOM tree in a place where the reset is reached. Where is this device > in the QOM tree? Reset doesn't follow the QOM tree. In fact this is the main reason why I dislike TYPE_DEVICE as a superclass... Paolo