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 <boris.ostrov...@oracle.com>
Reviewed-by: Juergen Gross <jgr...@suse.com>
---
 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 bb36b1e..d6786b8 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1146,13 +1146,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.7.4

Reply via email to