@@ -3255,9 +3255,9 @@ static enum hvm_translation_result __hvm
while ( todo > 0 )
{
enum hvm_translation_result res;
- paddr_t gpa = addr & ~PAGE_MASK;
+ unsigned int pgoff = addr & ~PAGE_MASK;
- count = min_t(int, PAGE_SIZE - gpa, todo);
+ count = min_t(int, PAGE_SIZE - pgoff, todo);
res = hvm_translate_get_page(v, addr, flags & HVMCOPY_linear,
pfec, pfinfo, &page, &gfn, &p2mt);
@@ -3279,7 +3279,7 @@ static enum hvm_translation_result __hvm
return HVMTRANS_need_retry;
}
- p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK);
+ p = __map_domain_page(page) + pgoff;
if ( flags & HVMCOPY_to_guest )
{
This is to reflect its actual purpose. Also use in a 2nd place. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- v4: New.