diff mbox

[Xen-devel,2/3] xen: arm: when ALLOCATING p2m entries maddr is meaningless

Message ID 1405355225-4623-2-git-send-email-ian.campbell@citrix.com
State Accepted
Commit e2bc4eccf0ef0e294f6da86c6a6066e9329419d5
Headers show

Commit Message

Ian Campbell July 14, 2014, 4:27 p.m. UTC 
The maddr differs on each loop depending on the pages which happen to get
allocated.

There is already an assertion that maddr == 0.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen/arch/arm/p2m.c |    1 -
 1 file changed, 1 deletion(-)

Comments

Julien Grall July 14, 2014, 6:29 p.m. UTC | #1 
Hi Ian,

On 07/14/2014 05:27 PM, Ian Campbell wrote:
> The maddr differs on each loop depending on the pages which happen to get
> allocated.
> 
> There is already an assertion that maddr == 0.

I think we hit the assert we don't use 1:1 mapping for DOM0.


> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Acked-by: Julien Grall <julien.grall@linaro.org>

> ---
>  xen/arch/arm/p2m.c |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index 917baa3..a10cbaf 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -501,7 +501,6 @@ static int apply_one_level(struct domain *d,
>                  p2m->stats.mappings[level]++;
>  
>                  *addr += level_size;
> -                *maddr += level_size;
>  
>                  return P2M_ONE_PROGRESS;
>              }
> 

Regards,
Ian Campbell July 18, 2014, 1:38 p.m. UTC | #2 
On Mon, 2014-07-14 at 19:29 +0100, Julien Grall wrote:
> Acked-by: Julien Grall <julien.grall@linaro.org>

Applied, thanks.
diff mbox

Patch

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 917baa3..a10cbaf 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -501,7 +501,6 @@  static int apply_one_level(struct domain *d,
                 p2m->stats.mappings[level]++;
 
                 *addr += level_size;
-                *maddr += level_size;
 
                 return P2M_ONE_PROGRESS;
             }