From patchwork Tue Jun 6 01:05:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 771566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3whYQP01l2z9s3s for ; Tue, 6 Jun 2017 11:05:33 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3whYQN5mk3zDqKv for ; Tue, 6 Jun 2017 11:05:32 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3whYQH3C3szDqFH for ; Tue, 6 Jun 2017 11:05:27 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id 3whYQH2RRMz9s74; Tue, 6 Jun 2017 11:05:27 +1000 (AEST) From: Jeremy Kerr To: skiboot@lists.ozlabs.org Date: Tue, 6 Jun 2017 09:05:02 +0800 Message-Id: <1496711102-11859-1-git-send-email-jk@ozlabs.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495695955-30718-6-git-send-email-jk@ozlabs.org> References: <1495695955-30718-6-git-send-email-jk@ozlabs.org> Subject: [Skiboot] [PATCH v3 05/12] opal-prd: interpret log level prefixes from HBRT X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dan Crowell , Frederic Bonnard MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Interpret the (optional) *_MRK log prefixes on HBRT messages, and set the syslog log priority to suit. Signed-off-by: Jeremy Kerr --- v3: Parse priority from HBRT log prefixes --- external/opal-prd/opal-prd.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c index d3c83b7..7113a35 100644 --- a/external/opal-prd/opal-prd.c +++ b/external/opal-prd/opal-prd.c @@ -270,7 +270,25 @@ extern int call_run_command(int argc, const char **argv, char **o_outString); void hservice_puts(const char *str) { - pr_log(LOG_INFO, "HBRT: %s", str); + int priority = LOG_INFO; + + /* Interpret the 2-character ERR_MRK/FAIL_MRK/WARN_MRK prefixes that + * may be present on HBRT log messages, and bump the log priority as + * appropriate. + */ + if (strlen(str) >= 2 && str[1] == '>') { + switch (str[0]) { + case 'E': + case 'F': + priority = LOG_ERR; + break; + case 'W': + priority = LOG_WARNING; + break; + } + } + + pr_log(priority, "HBRT: %s", str); } void hservice_assert(void)