X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fxen%2Fgrant-table.c;h=b4d4eac761db6241042e60db3b604caa9150e91e;hb=2f2fde927243bde5fd106da692efef34be12f81c;hp=1cd94daa71db8379443115dd052bc5705fc74432;hpb=21ebd6c68b5511b55f4f456e4ba17c2d711e3617;p=cascardo%2Flinux.git

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 1cd94daa71db..b4d4eac761db 100644
--- a/drivers/xen/grant-table.c
+++ b/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) {