[Xen-changelog] [xen master] xen/arm: p2m: Fix hypercall preemption when domain is relinquish memory mapping

[patchbot@xxxxxxx]

commit 3d929ba0cd0e84548f6d35fa77da08663ba4b0d0
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Wed Dec 18 16:54:08 2013 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Dec 18 16:56:57 2013 +0000

    xen/arm: p2m: Fix hypercall preemption when domain is relinquish memory 
mapping
    
    The commit 84f29a9 "xen/arm: Add relinquish_p2m_mapping to remove reference 
on
    every mapped page" doesn't save correctly the next gfn when the hypercall
    is preempted.
    
    Instead of storing the next gfn, it store the next mfn. Fix it by using
    'addr' instead of 'maddr'.
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/p2m.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 3f4ab37..d24a6fc 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -366,7 +366,7 @@ static int create_p2m_entries(struct domain *d,
         {
             if ( hypercall_preempt_check() )
             {
-                p2m->next_gfn_to_relinquish = maddr >> PAGE_SHIFT;
+                p2m->next_gfn_to_relinquish = addr >> PAGE_SHIFT;
                 rc = -EAGAIN;
                 goto out;
             }
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog