From patchwork Mon Jul 4 15:13:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9212859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D050960752 for ; Mon, 4 Jul 2016 15:16:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0CA02873A for ; Mon, 4 Jul 2016 15:16:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B591E2873C; Mon, 4 Jul 2016 15:16:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 479022873A for ; Mon, 4 Jul 2016 15:16:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bK5Z0-0001AQ-JI; Mon, 04 Jul 2016 15:13:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bK5Yz-00018g-F9 for xen-devel@lists.xenproject.org; Mon, 04 Jul 2016 15:13:33 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id E3/1B-04210-C1D7A775; Mon, 04 Jul 2016 15:13:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRWlGSWpSXmKPExsXitHRDpK5UbVW 4wfe5jBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bSxsssBT28FfOmlzcwzuLqYuTkkBDwl1j6 /ScriM0moCzxs7OXDcQWEdCTaDrwnBHEZhZwkth4+SYLiC0s4C7x5u8fJhCbRUBFomnfZXYQm 1fAWeLqxJ9MEDPlJM4f/8kMYnMKuEic/PsJbKYQUM3GbdOgbAWJjunHmCB6BSVOznzCArFLQu LgixfMEHO4JW6fnso8gZFvFpKyWUjKFjAyrWLUKE4tKkst0jWy0EsqykzPKMlNzMzRNTQw1ct NLS5OTE/NSUwq1kvOz93ECAypegYGxh2Mfav8DjFKcjApifLqJFeFC/El5adUZiQWZ8QXleak Fh9i1ODgEJhwdu50JimWvPy8VCUJ3p3VQHWCRanpqRVpmTnAoIcpleDgURLhnQ2S5i0uSMwtz kyHSJ1iVJQS5z0HkhAASWSU5sG1wSLtEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVh3m8gU3 gy80rgpr8CWswEtJg1thxkcUkiQkqqgZGbh83QTlneg81qvlfn5+t/rSNT76tw+fy5tfUf/+V Jyz6aue/d3/6hYGbEToM3PmX/+GdMaxdwybsnF/RVJl/xj8aKR6beq3pXWC50OeCbujHuv1r0 oT+bjyh+Xzt7eb1tl87njXNDHLttmU22d3+3j6uYnW39mW3O8TjZW3tWdNew+U403qnEUpyRa KjFXFScCAAgRhIdrwIAAA== X-Env-Sender: prvs=986c92fd1=wei.liu2@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1467645208!48431088!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61643 invoked from network); 4 Jul 2016 15:13:29 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 4 Jul 2016 15:13:29 -0000 X-IronPort-AV: E=Sophos;i="5.26,575,1459814400"; d="scan'208";a="364270777" From: Wei Liu To: Xen-devel Date: Mon, 4 Jul 2016 16:13:22 +0100 Message-ID: <1467645206-28142-2-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1467645206-28142-1-git-send-email-wei.liu2@citrix.com> References: <1467645206-28142-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v2 1/5] xen/console: consolidate log levels to an array X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP It cleaner than open-coding strings and numbers. The array will also become handy later when we need to refactor things a bit. No functional change. Signed-off-by: Wei Liu --- Cc: Jan Beulich --- xen/drivers/char/console.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 650035d..6620a1c 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -139,6 +139,20 @@ custom_param("guest_loglvl", parse_guest_loglvl); static atomic_t print_everything = ATOMIC_INIT(0); +struct log_level { + const char *str; + unsigned int num; +}; + +static struct log_level __initdata log_levels[] = { + { "none", 0 }, + { "error", 1 }, + { "warning", 2 }, + { "info", 3 }, + { "debug", 4 }, + { "all", 4 }, +}; + #define ___parse_loglvl(s, ps, lvlstr, lvlnum) \ if ( !strncmp((s), (lvlstr), strlen(lvlstr)) ) { \ *(ps) = (s) + strlen(lvlstr); \ @@ -147,12 +161,11 @@ static atomic_t print_everything = ATOMIC_INIT(0); static int __init __parse_loglvl(char *s, char **ps) { - ___parse_loglvl(s, ps, "none", 0); - ___parse_loglvl(s, ps, "error", 1); - ___parse_loglvl(s, ps, "warning", 2); - ___parse_loglvl(s, ps, "info", 3); - ___parse_loglvl(s, ps, "debug", 4); - ___parse_loglvl(s, ps, "all", 4); + unsigned int i; + + for ( i = 0; i < ARRAY_SIZE(log_levels); i++ ) + ___parse_loglvl(s, ps, log_levels[i].str, log_levels[i].num); + return 2; /* sane fallback */ }