From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCkIX-00031r-T1 for qemu-devel@nongnu.org; Wed, 08 Jul 2015 04:01:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCkIS-00071k-Sg for qemu-devel@nongnu.org; Wed, 08 Jul 2015 04:01:41 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:46582) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCkIS-00071C-I9 for qemu-devel@nongnu.org; Wed, 08 Jul 2015 04:01:36 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 8 Jul 2015 09:01:34 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 8C520219006F for ; Wed, 8 Jul 2015 09:01:07 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t6881TxH31195164 for ; Wed, 8 Jul 2015 08:01:29 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 t6881TgD029616 for ; Wed, 8 Jul 2015 02:01:29 -0600 Message-ID: <559CD8D8.20604@de.ibm.com> Date: Wed, 08 Jul 2015 10:01:28 +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> <559CD740.1020201@redhat.com> In-Reply-To: <559CD740.1020201@redhat.com> 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: Paolo Bonzini , Peter Crosthwaite , Cornelia Huck Cc: Xu Wang , jfrei@linux.vnet.ibm.com, "qemu-devel@nongnu.org Developers" , Alexander Graf Am 08.07.2015 um 09:54 schrieb Paolo Bonzini: > > > 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... Oh, thats why we were asked to use that instead of sysbus device? ;-)