From patchwork Mon Mar 14 15:56:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Filippakis X-Patchwork-Id: 597120 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 3qP2Rh4jSWz9s5J for ; Tue, 15 Mar 2016 02:56:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=EItUFlei; dkim-atps=neutral Received: from localhost ([::1]:41892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afUr8-0005lU-Rq for incoming@patchwork.ozlabs.org; Mon, 14 Mar 2016 11:56:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afUqr-0005Se-8r for qemu-devel@nongnu.org; Mon, 14 Mar 2016 11:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afUqn-0005Jz-3c for qemu-devel@nongnu.org; Mon, 14 Mar 2016 11:56:13 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afUqm-0005Js-Ti for qemu-devel@nongnu.org; Mon, 14 Mar 2016 11:56:09 -0400 Received: by mail-wm0-x242.google.com with SMTP id l68so16039171wml.3 for ; Mon, 14 Mar 2016 08:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=x6KOKvwyUXdKCZZXD0BZES4JMpfOGRF4tI+yys++mf4=; b=EItUFleiiAPPGaDse4vRBJJHwBlXIByB264pBWUu1J1i+VVdBUuvhMd6cBxbn8GxAS 94meUiCJrVSaPv40o/swFa+nI9M62BHD2Kv5wXLMywKGxzNKdYBv3neg48+uYKuc78XP f1JaGtWAUW8q9mbNaJTA5cceadcbKxdX9UyC4QmiGcDTSwCZT1tjgpEhYrlcoC16tG5O rGnDQ4fsHMuyuYrXvOoWlYoAM4Bm8mSI5YaiSqn1l4I76BdNwa2XJLlFw5lpSkT9Ps3I kMSRZonYqlvzQMoarCT9aqa4Y6lua38z+4hlI7xDXuATIQHP14VVUbj1Yimgnm75f1IP noaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=x6KOKvwyUXdKCZZXD0BZES4JMpfOGRF4tI+yys++mf4=; b=MWfGaSY11BnrRvXWX2I3h8NC/FRZECyb0noR7Yw47jYKPyItjKfCBBooAsD5Q/tjua 0xo7PkL7QOYUs1gr1tPdfL/jSkiqnOK2I4txdZSNoonrukhwwK2BY7/JP26/9CinMLUN GtPbRihuuvgltB3/UfPaHRfxsHlS66IFL160IMfbyZTKARtd0M8AAydKCxtck5BkXVbk llPBCiPjJlBGSVziYbIta6u42TtYoOY2QYSJgP4INpwNZo8DTIaTPv/m72Ol+Q4tHxfq SpDn9/90z1fC6zc+nGsUyVFIkpNDcWLFzlxrZ1iF3g1HSvBUz8TUrcIqVjCsuJLqhhZi A4PA== X-Gm-Message-State: AD7BkJIq4a+g1biJwkF5q8u/CCqEdjGdFY3NTq2ErIdezuATqHYqZQYqnDMlbK7wT+fRIw== X-Received: by 10.194.116.9 with SMTP id js9mr29261981wjb.112.1457970968054; Mon, 14 Mar 2016 08:56:08 -0700 (PDT) Received: from localhost.localdomain (ppp046177147198.access.hol.gr. [46.177.147.198]) by smtp.gmail.com with ESMTPSA id s66sm16866657wmb.6.2016.03.14.08.56.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Mar 2016 08:56:07 -0700 (PDT) From: Nikos Filippakis To: qemu-devel@nongnu.org Date: Mon, 14 Mar 2016 17:56:00 +0200 Message-Id: <1457970960-25883-1-git-send-email-aesmade@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Cc: Nikos Filippakis , peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 2/4] omap1: Change qemu_system_reset_request to watchdog_perform_action where appropriate 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 Instead of using qemu_system_reset_request() to reset when a watchdog triggers, let watchdog_perform_action() decide what to do, as stated in the BiteSizedTasks wiki page. Signed-off-by: Nikos Filippakis --- hw/arm/omap1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 6f68130..4c719f8 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -28,6 +28,7 @@ #include "sysemu/blockdev.h" #include "qemu/range.h" #include "hw/sysbus.h" +#include "sysemu/watchdog.h" /* Should signal the TCMI/GPMC */ uint32_t omap_badwidth_read8(void *opaque, hwaddr addr) @@ -349,7 +350,7 @@ static void omap_wd_timer_write(void *opaque, hwaddr addr, /* XXX: on T|E hardware somehow this has no effect, * on Zire 71 it works as specified. */ s->reset = 1; - qemu_system_reset_request(); + watchdog_perform_action(); } } s->last_wr = value & 0xff;