瀏覽代碼

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>
Boris Ostrovsky 8 年之前
父節點
當前提交
8613d78ab0
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      drivers/xen/grant-table.c

+ 4 - 4
drivers/xen/grant-table.c

@@ -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