From patchwork Thu Jul 9 16:51:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 493495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CB59E1402BB for ; Fri, 10 Jul 2015 02:52:36 +1000 (AEST) Received: from localhost ([::1]:40925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDF3q-0002fg-OZ for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2015 12:52:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDF3Q-0001qd-EB for qemu-devel@nongnu.org; Thu, 09 Jul 2015 12:52:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDF3J-0003pE-SL for qemu-devel@nongnu.org; Thu, 09 Jul 2015 12:52:08 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:49125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDF3J-0003ou-I0 for qemu-devel@nongnu.org; Thu, 09 Jul 2015 12:52:01 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 9 Jul 2015 17:51:59 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 9 Jul 2015 17:51:37 +0100 X-Helo: d06dlp03.portsmouth.uk.ibm.com X-MailFrom: cornelia.huck@de.ibm.com X-RcptTo: qemu-devel@nongnu.org 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 C4DAB1B08069 for ; Thu, 9 Jul 2015 17:52:48 +0100 (BST) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t69GpbVk25362468 for ; Thu, 9 Jul 2015 16:51:37 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t69GpaJG013887 for ; Thu, 9 Jul 2015 10:51:36 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t69GpYEc013844; Thu, 9 Jul 2015 10:51:35 -0600 From: Cornelia Huck To: qemu-devel@nongnu.org Date: Thu, 9 Jul 2015 18:51:32 +0200 Message-Id: <1436460692-5142-3-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 2.3.8 In-Reply-To: <1436460692-5142-1-git-send-email-cornelia.huck@de.ibm.com> References: <1436460692-5142-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15070916-0013-0000-0000-000004A3116B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.109 Cc: peter.crosthwaite@xilinx.com, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Cornelia Huck , gesaint@linux.vnet.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH for-2.4 2/2] watchdog/diag288: handle subsystem resets correctly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xu Wang 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 Signed-off-by: Cornelia Huck --- 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)