From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCQ8E-0004QB-Or for qemu-devel@nongnu.org; Tue, 07 Jul 2015 06:29:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCQ87-00085v-HJ for qemu-devel@nongnu.org; Tue, 07 Jul 2015 06:29:42 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:58937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCQ87-000848-8Z for qemu-devel@nongnu.org; Tue, 07 Jul 2015 06:29:35 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Jul 2015 11:29:32 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id A95CF1B08061 for ; Tue, 7 Jul 2015 11:30:40 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t67ATTkg35586094 for ; Tue, 7 Jul 2015 10:29:30 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t67ATTbQ002140 for ; Tue, 7 Jul 2015 04:29:29 -0600 Message-ID: <559BAA09.7040801@de.ibm.com> Date: Tue, 07 Jul 2015 12:29:29 +0200 From: Christian Borntraeger MIME-Version: 1.0 References: <1436259202-20509-1-git-send-email-cornelia.huck@de.ibm.com> <1436259202-20509-2-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1436259202-20509-2-git-send-email-cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=iso-8859-15 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: Cornelia Huck , qemu-devel@nongnu.org Cc: Xu Wang , jfrei@linux.vnet.ibm.com, agraf@suse.de Am 07.07.2015 um 10:53 schrieb Cornelia Huck: > 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 kdump/kexec and reboot disable the watchdog. Tested-by: Christian Borntraeger > --- > 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); > diag288->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, diag288_timer_expired, > dev); > } >