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 89bb8b4897f927a7cc65e722b8ab6fb6d311f135..34bdb6d84bedb9ec7b50d6e217608fdd05d30d0b 100644 (file)
--- 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;