From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755386AbcAVVgz (ORCPT ); Fri, 22 Jan 2016 16:36:55 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:27483 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755265AbcAVVge (ORCPT ); Fri, 22 Jan 2016 16:36:34 -0500 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, roger.pau@citrix.com, mcgrof@suse.com, Boris Ostrovsky Subject: [PATCH v1 05/12] xen/hvmlite: Allow HVMlite guests delay initializing grant table Date: Fri, 22 Jan 2016 16:35:51 -0500 Message-Id: <1453498558-6028-6-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> References: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org .. just like we currently do for PVH guests Signed-off-by: Boris Ostrovsky --- 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 effbaf9..8c6c0cf 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 -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: [PATCH v1 05/12] xen/hvmlite: Allow HVMlite guests delay initializing grant table Date: Fri, 22 Jan 2016 16:35:51 -0500 Message-ID: <1453498558-6028-6-git-send-email-boris.ostrovsky@oracle.com> References: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aMjNh-0004JV-LE for xen-devel@lists.xenproject.org; Fri, 22 Jan 2016 21:36:33 +0000 In-Reply-To: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: Boris Ostrovsky , xen-devel@lists.xenproject.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org .. just like we currently do for PVH guests Signed-off-by: Boris Ostrovsky --- 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 effbaf9..8c6c0cf 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 -- 1.7.1