|
@@ -1146,13 +1146,13 @@ EXPORT_SYMBOL_GPL(gnttab_init);
|
|
|
|
|
|
static int __gnttab_init(void)
|
|
static int __gnttab_init(void)
|
|
{
|
|
{
|
|
|
|
+ if (!xen_domain())
|
|
|
|
+ return -ENODEV;
|
|
|
|
+
|
|
/* Delay grant-table initialization in the PV on HVM case */
|
|
/* Delay grant-table initialization in the PV on HVM case */
|
|
- if (xen_hvm_domain())
|
|
|
|
|
|
+ if (xen_hvm_domain() && !xen_pvh_domain())
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- if (!xen_pv_domain())
|
|
|
|
- return -ENODEV;
|
|
|
|
-
|
|
|
|
return gnttab_init();
|
|
return gnttab_init();
|
|
}
|
|
}
|
|
/* Starts after core_initcall so that xen_pvh_gnttab_setup can be called
|
|
/* Starts after core_initcall so that xen_pvh_gnttab_setup can be called
|