From 1a0254c11e1385a1ce9a4cd6904f8781c72c61bc Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 17 Jan 2013 22:09:55 -0500 Subject: [PATCH] Revert "xen/grant-table: Force to use v1 of grants." This reverts commit 382c2422150c4636f057f29c01eb7619265eb112. --- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 2.39.5