[Xen-changelog] [xen master] x86/HVM: rename a variable in __hvm_copy()

[patchbot@xxxxxxx]

commit 22f5696e6a6ba328f275f4249886aa739c5c716f
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Feb 5 13:51:56 2020 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Feb 5 13:51:56 2020 +0100

    x86/HVM: rename a variable in __hvm_copy()
    
    This is to reflect its actual purpose. Also use in a 2nd place.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 2fee569a5f..fc66d72eac 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -3255,9 +3255,9 @@ static enum hvm_translation_result __hvm_copy(
     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_copy(
             return HVMTRANS_need_retry;
         }
 
-        p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK);
+        p = __map_domain_page(page) + pgoff;
 
         if ( flags & HVMCOPY_to_guest )
         {
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog