From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 18 Jan 2013 03:09:55 +0000 (-0500)
Subject: Revert "xen/grant-table: Force to use v1 of grants."
X-Git-Tag: next-20130218~34^2~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a0254c11e1385a1ce9a4cd6904f8781c72c61bc;p=karo-tx-linux.git

Revert "xen/grant-table: Force to use v1 of grants."

This reverts commit 382c2422150c4636f057f29c01eb7619265eb112.
---

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 89bb8b4897f9..34bdb6d84bed 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1061,8 +1061,10 @@ static void gnttab_request_version(void)
 	int rc;
 	struct gnttab_set_version gsv;
 
-	gsv.version = 1;
-
+	if (xen_hvm_domain())
+		gsv.version = 1;
+	else
+		gsv.version = 2;
 	rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1);
 	if (rc == 0 && gsv.version == 2) {
 		grant_table_version = 2;