From fc57fe9c1d5b6db6465b22f9939fe3133de62d5e Mon Sep 17 00:00:00 2001 From: Boris Ostrovsky Date: Mon, 6 Feb 2017 10:56:15 -0500 Subject: [PATCH] xen/pvh: Initialize grant table for PVH guests Like PV guests, PVH does not have PCI devices and therefore cannot use MMIO space to store grants. Instead it balloons out memory and keeps grants there. Signed-off-by: Boris Ostrovsky Reviewed-by: Juergen Gross OraBug: 26662731 (cherry picked from commit 8613d78ab09900010a5b32e78ff229f551d661d6) Signed-off-by: Boris Ostrovsky Reviewed-by: Joao Martins --- drivers/xen/grant-table.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index f6087f754e76..7086fb237b50 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1154,13 +1154,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_pvh_domain()) return 0; - if (!xen_pv_domain()) - return -ENODEV; - return gnttab_init(); } /* Starts after core_initcall so that xen_pvh_gnttab_setup can be called -- 2.50.1