From patchwork Mon Aug 14 07:08:30 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: 9898245 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 78BC060230 for ; Mon, 14 Aug 2017 07:12:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C89526E1A for ; Mon, 14 Aug 2017 07:12:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 619E92832D; Mon, 14 Aug 2017 07:12:19 +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 AC343285D8 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 1dh9Vp-0006LO-C2; Mon, 14 Aug 2017 07:10:09 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Vn-0006Fa-Lz for xen-devel@lists.xenproject.org; Mon, 14 Aug 2017 07:10:07 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id B8/91-27137-FCC41995; Mon, 14 Aug 2017 07:10:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ov+45n4m RBtufqFh83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBkXVuxgL5jDX3Hm+lSWBsa73F2MnBwSAkYS byf+Y+pi5OIQEjjGKDHpYyczSIJNQFViw/VTrCC2iICSxL1Vk5lAbGYBV4mG30vB4sICuRLXn p0Hq2cBqr8ztQMszitgKvG9ZyU7xAJ5iY4Dk1lAbE6g+KV9S8FsIQETib6tXSwTGLkXMDKsYt QoTi0qSy3SNbLUSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCrWS87P3cQI9C8DEOxgPLAo8BC jJAeTkihvgk9vpBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3hneEyOFBItS01Mr0jJzgIEGk5bg 4FES4V0BkuYtLkjMLc5Mh0idYtTleDXh/zcmIZa8/LxUKXHeGJAiAZCijNI8uBGwoL/EKCslz MsIdJQQT0FqUW5mCar8K0ZxDkYlYd4akCk8mXklcJteAR3BBHREH8j9vMUliQgpqQZG/mPiYa IfT0ubLv1WyJDJb6dXLro21uTawrSw8tuy4c+vaZ6tZivzOCtkpnXsqVrEpx3fd27coasvLJK 728njxImyqO/WW1Ljv/4vT1XZJvv+qetSDleTI5M/r/slzMG0dHV1b42rfk/dzf2lIWWfpjLe 3diWsESx65Wh7o7vS3O779+cWGypxFKckWioxVxUnAgAIRsTL3UCAAA= X-Env-Sender: jgross@suse.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1502694606!99218723!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 32554 invoked from network); 14 Aug 2017 07:10:06 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-14.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 14 Aug 2017 07:10:06 -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 2F6E2AD35 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:30 +0200 Message-Id: <20170814070849.20986-34-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 33/52] xen/drivers/passthrough/iommu.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/iommu.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/iommu.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 5e81813942..8a333e177e 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -21,7 +21,7 @@ #include #include -static void parse_iommu_param(char *s); +static int parse_iommu_param(char *s); static void iommu_dump_p2m_table(unsigned char key); unsigned int __read_mostly iommu_dev_iotlb_timeout = 1000; @@ -78,10 +78,10 @@ DEFINE_SPINLOCK(iommu_pt_cleanup_lock); PAGE_LIST_HEAD(iommu_pt_cleanup_list); static struct tasklet iommu_pt_cleanup_tasklet; -static void __init parse_iommu_param(char *s) +static int __init parse_iommu_param(char *s) { char *ss; - int val; + int val, b, rc = 0; do { val = !!strncmp(s, "no-", 3); @@ -92,8 +92,9 @@ static void __init parse_iommu_param(char *s) if ( ss ) *ss = '\0'; - if ( !parse_bool(s) ) - iommu_enable = 0; + b = parse_bool(s); + if ( b >= 0 ) + iommu_enable = b; else if ( !strcmp(s, "force") || !strcmp(s, "required") ) force_iommu = val; else if ( !strcmp(s, "workaround_bios_bug") ) @@ -124,9 +125,13 @@ static void __init parse_iommu_param(char *s) iommu_dom0_strict = val; else if ( !strcmp(s, "sharept") ) iommu_hap_pt_share = val; + else + rc = -EINVAL; s = ss + 1; } while ( ss ); + + return rc; } int iommu_domain_init(struct domain *d)