From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Mon, 6 Feb 2017 15:56:15 +0000 (-0500)
Subject: xen/pvh: Initialize grant table for PVH guests
X-Git-Tag: v4.1.12-111.0.20170918_2215~247
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fc57fe9c1d5b6db6465b22f9939fe3133de62d5e;p=users%2Fjedix%2Flinux-maple.git

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>

OraBug: 26662731

(cherry picked from commit 8613d78ab09900010a5b32e78ff229f551d661d6)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
---

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index f6087f754e76f..7086fb237b508 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