From 3d929ba0cd0e84548f6d35fa77da08663ba4b0d0 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Wed, 18 Dec 2013 16:54:08 +0000 Subject: [PATCH] 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 Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 3f4ab37915..d24a6fc7b1 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; } -- 2.39.5