Message ID | 20191216110904.30815-11-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | aabf1de4b7a2fb14797946f8eb970d391cecf0d8 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4175095ile; Mon, 16 Dec 2019 03:24:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwJdXiQL1/QM5PQu7sVyFrLf1zOj5XsL/pNqUubGqGppx6zXlDnBJaOXW83O2fARKlq0jWg X-Received: by 2002:a9d:73c8:: with SMTP id m8mr32346172otk.34.1576495462291; Mon, 16 Dec 2019 03:24:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576495462; cv=none; d=google.com; s=arc-20160816; b=DI6VL/u4BhPEW0P725VIerO8wKTPL26wAyu5yYuXTKIeph8jouPkvGkOItybuer1q7 7IjTp0XUDIZXVoPvbGEhRiLj7huIf1UHvm0CWXhfc+S9ZlEZzv3EsxGrjAkq5lZQRmfg HAHkrQd5dgg6RREpT2B4J+ua2yIz5Cw5mvLj2IdjyuWxREyQtmLndXS2/S3ib8APlXvJ 90LwMxaWhvJ5wwnVZMJJkPlrvPz03Th4gCTKkSv/t4mTDSFhd+GWlf2FR0IdnF9PRFRU aydyI4JSY+JpyP5YBSmcYpMoUEm6qAzAk3a93SnOOyZ2y9u7WqfHDkpaEYR9en2Ik6+A IAlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=INEC+O3trc34/sQ9VXKjuFm8nPKS5N+4sZ+l5CuQdRo=; b=gIST+XFRzR9Qxu6YyHONsutaShW8jK9JVvA1yzkt4pSDwLyjB8tPCYHOMFcHdeMe52 RM8s9ssNo1IJpgBn6neWOLZ2sOH9UkvqaZZkMFfoFtXlvLD4hOF6BCtp1i+qxsFh4414 LgaKp9sFofgf0CtDukgVJ8kUK/ygp60zMQHZayW8vmzp/kEMkR/+kKqJ+DXXvLhxoazD py6ylXtTGVq3LLW6tDwEAs85NcHVuXv9BTVk+fKAb4LISYO11UAxiB3sj7mAaqQ4b0Fy 2AvxfnKDGPBDsDUT4gHPVIrrGBuP0tjP0nsQ43QScWRMNVvIsfBoP1ANbhFUWxS70sXp 97Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lh1e8t1V; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s126si9565810oib.84.2019.12.16.03.24.22 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Dec 2019 03:24:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lh1e8t1V; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1igoU9-0001ne-42 for patch@linaro.org; Mon, 16 Dec 2019 06:24:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50915) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1igoFe-0007dl-EA for qemu-devel@nongnu.org; Mon, 16 Dec 2019 06:09:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1igoFd-0007nT-AG for qemu-devel@nongnu.org; Mon, 16 Dec 2019 06:09:22 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54849) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1igoFd-0007lW-45 for qemu-devel@nongnu.org; Mon, 16 Dec 2019 06:09:21 -0500 Received: by mail-wm1-x344.google.com with SMTP id b19so6249831wmj.4 for <qemu-devel@nongnu.org>; Mon, 16 Dec 2019 03:09:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=INEC+O3trc34/sQ9VXKjuFm8nPKS5N+4sZ+l5CuQdRo=; b=Lh1e8t1VanEgXHprir+MfcM8kydEMOOKZ6lsmPA657uh3UJa8N3oRjM1Hr1nwhnfAO ucl7yInlLKGjv1R4vAC0Lc8tF7pfI2+dNPcyrPgr9LaebJSugLG22mJ3Fh/kHcg2pTNx P1JbPUu/fCwf73qXMPbev+W8oygWkw+oAyANN+lxSgWy+PgQcOhai7snbZBnKXFemYWz TiZyXkka3+zJH7aEU0STz1TqNIBxUA5Y/yqgiOFfYZVIMbtQSLViocuko0DPAi/7YwN+ 9tnz4YZuHiw+sLwSv81hrG3Gwiq/70Sz+fKS+NdpJvrtMcvG2QV3Lwj44o+LozRkdUE2 lbPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=INEC+O3trc34/sQ9VXKjuFm8nPKS5N+4sZ+l5CuQdRo=; b=jz3nDKNA0eDt3TkyfnaW9p6YhFBzfxN6fclLMfoOiZvKZ+vI6emVj1QPSi8RdMEsz4 kpwYsrqGX6He2ZIbC2O0IALJrbXyhlxqB1bAvLgAJyAom64ZkBltnK/8tuqeSkUUdEwF b3d7NFIZGW5LW098ywwjltKCHae35FXb4wzqPF3u71ueu0XgQk8sNuUKqmMQeHhDAY4D pC5uJvSc3X1Vd84fuR5/GLaXure3gcxL4r5jOIdsNpWAEETIsqojs8WLzY9slDgbePrK qk2s5XznuPKrhLard/TF5yGqR6ttY8GxSjC58JXMIVrBfge7FSFPN+3o/KgDF+tTe7S5 Pz2A== X-Gm-Message-State: APjAAAWHcqJuTetftu21+N23DP4Ji+UnB6/RemjdlKkz6/CC8k0/9N5Z fOpDHweRPI6j7ulxgwt2ORK7fuwDciHQ+g== X-Received: by 2002:a1c:14e:: with SMTP id 75mr13969037wmb.123.1576494558774; Mon, 16 Dec 2019 03:09:18 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id x10sm20976131wrp.58.2019.12.16.03.09.18 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 03:09:18 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 10/34] watchdog/aspeed: Improve watchdog timeout message Date: Mon, 16 Dec 2019 11:08:40 +0000 Message-Id: <20191216110904.30815-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191216110904.30815-1-peter.maydell@linaro.org> References: <20191216110904.30815-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 145be6f99ce..d283d07d654 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -219,7 +219,8 @@ static void aspeed_wdt_timer_expired(void *dev) return; } - qemu_log_mask(CPU_LOG_RESET, "Watchdog timer expired.\n"); + qemu_log_mask(CPU_LOG_RESET, "Watchdog timer %" HWADDR_PRIx " expired.\n", + s->iomem.addr); watchdog_perform_action(); timer_del(s->timer); }