From patchwork Wed Aug 16 12:51:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9903631 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 8709D6038C for ; Wed, 16 Aug 2017 12:54:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79792289CD for ; Wed, 16 Aug 2017 12:54:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E8CB289E1; Wed, 16 Aug 2017 12:54:33 +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 1D020289CD for ; Wed, 16 Aug 2017 12:54:33 +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 1dhxoF-0008Nl-W6; Wed, 16 Aug 2017 12:52:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoD-0008Jd-U4 for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:30 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 4B/CF-02184-D0044995; Wed, 16 Aug 2017 12:52:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRWlGSWpSXmKPExsVyuP0Ovy6Pw5R Ig9PTDC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oz5DR2MBZP4Km6sCGpgnMvVxcjJISFgJPF2 4j+mLkYuDiGBhYwS3b+usYIk2ARUJTZcPwVmiwgoSdxbNZkJxGYWKJQ42d0HFhcWKJbY8OsGm M0CVH9o01+gGg4OXgETibtT+SHmy0t0HJjMAmJzAoUnbzgGZgsJGEts72lkn8DIvYCRYRWjRn FqUVlqka6xgV5SUWZ6RkluYmaOrqGBqV5uanFxYnpqTmJSsV5yfu4mRqBv6xkYGHcwTljld4h RkoNJSZQ3SGtKpBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3kV2QDnBotT01Iq0zBxgkMGkJTh4 lER402yB0rzFBYm5xZnpEKlTjLocryb8/8YkxJKXn5cqJc57C2SGAEhRRmke3AhYwF9ilJUS5 mVkYGAQ4ilILcrNLEGVf8UozsGoJMx7FWQKT2ZeCdymV0BHMAEdcaV9EsgRJYkIKakGxp6bTX p8E4uPlJxWnX/045zwSRJb2d6rnVureVVK5dOXgAupPoFOCg+3sm3giD2fLO6Q7B0paDgtWOT Q8j2v1nsYrenr1q5Lytp6+bZiUIFtfMe6p4dFhA8/nLsh5milw9PrOh0tqinuogcOMWvanVgU nvRF/ajmv3TJR9OnGkltf5rZu2v5KSWW4oxEQy3mouJEAB7dUpZzAgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1502887948!86395945!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5137 invoked from network); 16 Aug 2017 12:52:28 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-11.tower-206.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:28 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 777B0AEAF; Wed, 16 Aug 2017 12:52:28 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:51:49 +0200 Message-Id: <20170816125219.5255-23-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170816125219.5255-1-jgross@suse.com> References: <20170816125219.5255-1-jgross@suse.com> Cc: Juergen Gross , Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v3 22/52] xen/arch/x86/x86_64/mmconfig-shared.c: let custom parameter parsing routines return errno 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Modify the custom parameter parsing routines in: xen/arch/x86/x86_64/mmconfig-shared.c to indicate whether the parameter value was parsed successfully. Cc: Jan Beulich Cc: Andrew Cooper Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- V3: - dont return out of loop (Jan Beulich) - dont modify option value in parsing function --- xen/arch/x86/x86_64/mmconfig-shared.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index 488470bfeb..5a7118481d 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -28,22 +28,35 @@ unsigned int pci_probe = PCI_PROBE_CONF1 | PCI_PROBE_MMCONF; -static void __init parse_mmcfg(char *s) +static int __init parse_mmcfg(const char *s) { - char *ss; + const char *ss; + int rc = 0; do { ss = strchr(s, ','); - if ( ss ) - *ss = '\0'; + if ( !ss ) + ss = strchr(s, '\0'); - if ( !parse_bool(s) ) + switch ( parse_bool(s) ) { + case 0: pci_probe &= ~PCI_PROBE_MMCONF; - else if ( !strcmp(s, "amd_fam10") || !strcmp(s, "amd-fam10") ) - pci_probe |= PCI_CHECK_ENABLE_AMD_MMCONF; + break; + case 1: + break; + default: + if ( !strncmp(s, "amd_fam10", ss - s) || + !strncmp(s, "amd-fam10", ss - s) ) + pci_probe |= PCI_CHECK_ENABLE_AMD_MMCONF; + else + rc = -EINVAL; + break; + } s = ss + 1; - } while ( ss ); + } while ( *ss ); + + return rc; } custom_param("mmcfg", parse_mmcfg);