From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753300AbcBAPkN (ORCPT ); Mon, 1 Feb 2016 10:40:13 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:48150 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbcBAPkD (ORCPT ); Mon, 1 Feb 2016 10:40:03 -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 v2 04/11] xen/hvmlite: Allow HVMlite guests delay initializing grant table 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] 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 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 -- 1.7.1