From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMakn-0000tG-FW for qemu-devel@nongnu.org; Fri, 22 Jan 2016 07:23:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMakj-0001br-A8 for qemu-devel@nongnu.org; Fri, 22 Jan 2016 07:23:49 -0500 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:55729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMakj-0001bg-07 for qemu-devel@nongnu.org; Fri, 22 Jan 2016 07:23:45 -0500 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 22 Jan 2016 12:23:44 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7EDBB1B0804B for ; Fri, 22 Jan 2016 12:23:47 +0000 (GMT) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0MCNf5Y5308722 for ; Fri, 22 Jan 2016 12:23:42 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0MCNfQw029873 for ; Fri, 22 Jan 2016 05:23:41 -0700 From: Cornelia Huck Date: Fri, 22 Jan 2016 13:23:30 +0100 Message-Id: <1453465413-12846-8-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1453465413-12846-1-git-send-email-cornelia.huck@de.ibm.com> References: <1453465413-12846-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH 07/10] watchdog/diag288: don't reset for action=none|debug|pause List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, Bo Tu From: Bo Tu If the watchdog expires and the guest is not notified (NONE, DEBUG, PAUSE), we must not reset the watchdog device, otherwise watchdog_ping() and watchdog_stop() will fail when triggered by the guest. This reset behavior matches to the z/VM behavior when a custom command is to be executed on expiry. Reviewed-by: David Hildenbrand Signed-off-by: Bo Tu Signed-off-by: Cornelia Huck --- hw/watchdog/wdt_diag288.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index 2a885a4..ddda723 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -51,6 +51,13 @@ static void diag288_timer_expired(void *dev) { qemu_log_mask(CPU_LOG_RESET, "Watchdog timer expired.\n"); watchdog_perform_action(); + /* Reset the watchdog only if the guest was notified about expiry. */ + switch (get_watchdog_action()) { + case WDT_DEBUG: + case WDT_NONE: + case WDT_PAUSE: + return; + } wdt_diag288_reset(dev); } -- 2.7.0