---

yaml --- r: 286942 b: refs/heads/master c: 69e8f43 h: refs/heads/master v: v3
git-mirror · Jan 27, 2012 · eed736c · eed736c
1 parent 2bfcf8b
commit eed736c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c02b7b1610f873888af20f291c07730889ff0f9
+refs/heads/master: 69e8f430e243d657c2053f097efebc2e2cd559f0
diff --git a/trunk/drivers/xen/grant-table.c b/trunk/drivers/xen/grant-table.c
@@ -948,9 +948,12 @@ static void gnttab_request_version(void)
 	int rc;
 	struct gnttab_set_version gsv;
 
-	gsv.version = 2;
+	if (xen_hvm_domain())
+		gsv.version = 1;
+	else
+		gsv.version = 2;
 	rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1);
-	if (rc == 0) {
+	if (rc == 0 && gsv.version == 2) {
 		grant_table_version = 2;
 		gnttab_interface = &gnttab_v2_ops;
 	} else if (grant_table_version == 2) {