From patchwork Mon Aug 14 07:08:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9898197 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 2AAC56038C for ; Mon, 14 Aug 2017 07:12:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CF9826E4A for ; Mon, 14 Aug 2017 07:12:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10DA4285FE; Mon, 14 Aug 2017 07:12:16 +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 3806926E4A for ; Mon, 14 Aug 2017 07:12:15 +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 1dh9Uq-0003lc-UI; Mon, 14 Aug 2017 07:09:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Up-0003gq-Or for xen-devel@lists.xenproject.org; Mon, 14 Aug 2017 07:09:07 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id CB/34-01862-39C41995; Mon, 14 Aug 2017 07:09:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRWlGSWpSXmKPExsVyuP0Ov+4kn4m RBnevqVt83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBkze9+xFVwVrPg5bw17A2MHbxcjJ4eEgJHE 24n/mEBsIYFjjBKf1qWD2GwCqhIbrp9iBbFFBJQk7q2aDFbDLOAq0fB7KVhcWCBb4tO912xdj BwcLED1vZvdQUxeAVOJg6+LIKbLS3QcmMwCYnMChS/tW8oCsclEom9rF8sERu4FjAyrGNWLU4 vKUot0jfWSijLTM0pyEzNzdA0NjPVyU4uLE9NTcxKTivWS83M3MQL9ygAEOxibvzgdYpTkYFI S5U3w6Y0U4kvKT6nMSCzOiC8qzUktPsQow8GhJME7w3tipJBgUWp6akVaZg4wwGDSEhw8SiK8 eSBp3uKCxNzizHSI1ClGXY5XE/5/YxJiycvPS5US540BKRIAKcoozYMbAQv2S4yyUsK8jEBHC fEUpBblZpagyr9iFOdgVBLmrQGZwpOZVwK36RXQEUxAR/SB3M9bXJKIkJJqYHSfnD9BinPJy1 +TP9w07Hr6Z2bO5Sk9xYdb5D88CHuiM/fqsWPsx+d+ErPprcu0fpOdtn09Q0RVsuR24xc3nht KmTounnh5uXYz75rFTzPaYt4b3/Mo/+3Xu9ZzXou4aq9vX8qv5c39h57cKFb6wbXurn1vul9c /B+pj365765PVWm7Fr6s8ocSS3FGoqEWc1FxIgAp+tEPcQIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1502694546!102259712!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 6573 invoked from network); 14 Aug 2017 07:09:06 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-16.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 14 Aug 2017 07:09:06 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 648C3AD4B for ; Mon, 14 Aug 2017 07:09:06 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Mon, 14 Aug 2017 09:08:31 +0200 Message-Id: <20170814070849.20986-35-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170814070849.20986-1-jgross@suse.com> References: <20170814070849.20986-1-jgross@suse.com> Cc: Juergen Gross , Jan Beulich Subject: [Xen-devel] [PATCH v2 34/52] xen/drivers/passthrough/pci.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/drivers/passthrough/pci.c to indicate whether the parameter value was parsed successfully. Cc: Jan Beulich Signed-off-by: Juergen Gross Acked-by: Wei Liu --- xen/drivers/passthrough/pci.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index b02d48953b..82aa86b220 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -149,17 +149,17 @@ static struct phantom_dev { } phantom_devs[8]; static unsigned int nr_phantom_devs; -static void __init parse_phantom_dev(char *str) { +static int __init parse_phantom_dev(char *str) { const char *s = str; unsigned int seg, bus, slot; struct phantom_dev phantom; if ( !s || !*s || nr_phantom_devs >= ARRAY_SIZE(phantom_devs) ) - return; + return -EINVAL; s = parse_pci(s, &seg, &bus, &slot, NULL); if ( !s || *s != ',' ) - return; + return -EINVAL; phantom.seg = seg; phantom.bus = bus; @@ -170,10 +170,12 @@ static void __init parse_phantom_dev(char *str) { case 1: case 2: case 4: if ( *s ) default: - return; + return -EINVAL; } phantom_devs[nr_phantom_devs++] = phantom; + + return 0; } custom_param("pci-phantom", parse_phantom_dev); @@ -189,9 +191,10 @@ static u16 __read_mostly bridge_ctl_mask; * perr don't suppress parity errors (default) * no-perr suppress parity errors */ -static void __init parse_pci_param(char *s) +static int __init parse_pci_param(char *s) { char *ss; + int rc = 0; do { bool_t on = !!strncmp(s, "no-", 3); @@ -214,6 +217,8 @@ static void __init parse_pci_param(char *s) cmd_mask = PCI_COMMAND_PARITY; brctl_mask = PCI_BRIDGE_CTL_PARITY; } + else + rc = -EINVAL; if ( on ) { @@ -228,6 +233,8 @@ static void __init parse_pci_param(char *s) s = ss + 1; } while ( ss ); + + return rc; } custom_param("pci", parse_pci_param);