From patchwork Mon Feb 1 15:38:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 8180731 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6E2969F38B for ; Mon, 1 Feb 2016 15:42:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A0F7203C1 for ; Mon, 1 Feb 2016 15:42:41 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB0D5203B6 for ; Mon, 1 Feb 2016 15:42:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQGaB-0003Ba-E6; Mon, 01 Feb 2016 15:40:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQGa9-0003BA-R7 for xen-devel@lists.xenproject.org; Mon, 01 Feb 2016 15:40:01 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 65/80-28221-15C7FA65; Mon, 01 Feb 2016 15:40:01 +0000 X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1454341199!20581335!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56521 invoked from network); 1 Feb 2016 15:40:00 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Feb 2016 15:40:00 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u11Fdv0h019047 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Feb 2016 15:39:57 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u11Fdv0h022480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 1 Feb 2016 15:39:57 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u11Fdu2Z006409; Mon, 1 Feb 2016 15:39:56 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 01 Feb 2016 07:39:56 -0800 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Date: Mon, 1 Feb 2016 10:38:50 -0500 Message-Id: <1454341137-14110-5-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> References: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Cc: Boris Ostrovsky , xen-devel@lists.xenproject.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v2 04/11] xen/hvmlite: Allow HVMlite guests delay initializing grant table X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP .. just like we currently do for PVH guests Signed-off-by: Boris Ostrovsky Reviewed-by: David Vrabel --- arch/x86/xen/grant-table.c | 4 ++-- drivers/xen/grant-table.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c index e079500..40ad9c2 100644 --- a/arch/x86/xen/grant-table.c +++ b/arch/x86/xen/grant-table.c @@ -110,7 +110,7 @@ int arch_gnttab_init(unsigned long nr_shared) return arch_gnttab_valloc(&gnttab_shared_vm_area, nr_shared); } -#ifdef CONFIG_XEN_PVH +#ifdef CONFIG_XEN_PVHVM #include #include #include @@ -164,7 +164,7 @@ static int __init xlated_setup_gnttab_pages(void) static int __init xen_pvh_gnttab_setup(void) { - if (!xen_pvh_domain()) + if (!xen_pvh_domain() && !xen_hvmlite) return -ENODEV; return xlated_setup_gnttab_pages(); diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index c49f79e..9a239d5 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1147,13 +1147,13 @@ EXPORT_SYMBOL_GPL(gnttab_init); static int __gnttab_init(void) { + if (!xen_domain()) + return -ENODEV; + /* Delay grant-table initialization in the PV on HVM case */ - if (xen_hvm_domain()) + if (xen_hvm_domain() && !xen_hvmlite) return 0; - if (!xen_pv_domain()) - return -ENODEV; - return gnttab_init(); } /* Starts after core_initcall so that xen_pvh_gnttab_setup can be called