summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorEric Trudeau <etrudeau@broadcom.com>2013-12-04 11:39:33 +0000
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2013-12-04 11:39:33 +0000
commitc94cae53f9e564484f906a79be5639fc66e8cb02 (patch)
tree852b4a17d6d7ddaa9ea228b4b815b0f7e3e04f55 /drivers/xen
parent14883a75ec76b44759385fb12629f4a0f1aef4e3 (diff)
XEN: Grant table address, xen_hvm_resume_frames, is a phys_addr not a pfn
From: Eric Trudeau <etrudeau@broadcom.com> xen_hvm_resume_frames stores the physical address of the grant table. englighten.c was incorrectly setting it as if it was a page frame number. This caused the table to be mapped into the guest at an unexpected physical address. Additionally, a warning is improved to include the grant table address which failed in xen_remap. Signed-off-by: Eric Trudeau <etrudeau@broadcom.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/grant-table.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 028387192b60..aa846a48f400 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1176,7 +1176,8 @@ static int gnttab_setup(void)
gnttab_shared.addr = xen_remap(xen_hvm_resume_frames,
PAGE_SIZE * max_nr_gframes);
if (gnttab_shared.addr == NULL) {
- pr_warn("Failed to ioremap gnttab share frames!\n");
+ pr_warn("Failed to ioremap gnttab share frames (addr=0x%08lx)!\n",
+ xen_hvm_resume_frames);
return -ENOMEM;
}
}