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 <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index bb36b1e1dbcc68fd31490079fcb4e1feee0b70d7..d6786b87e13b2392c366cfa807c35cf2401c8387 100644 (file)
--- 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