[PATCH] x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b

[PATCH] x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b

[Andrew Cooper]

c/s 2fc002b "xen: Use a typesafe to define INVALID_GFN" changed INVALID_GFN to
be a boxed type.

Identified by a Travis randconfig run:
  https://travis-ci.org/xen-project/xen/jobs/144980445

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Tim Deegan <tim@xen.org>
CC: George Dunlap <george.dunlap@eu.citrix.com>
CC: Julien Grall <julien.grall@arm.com>
---
 xen/arch/x86/mm/shadow/none.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c
index 38bdf92..69e56c5 100644
--- a/xen/arch/x86/mm/shadow/none.c
+++ b/xen/arch/x86/mm/shadow/none.c
@@ -42,7 +42,7 @@ static unsigned long _gva_to_gfn(struct vcpu *v, struct p2m_domain *p2m,
                                  unsigned long va, uint32_t *pfec)
 {
     ASSERT_UNREACHABLE();
-    return INVALID_GFN;
+    return gfn_x(INVALID_GFN);
 }
 
 static void _update_cr3(struct vcpu *v, int do_locking)
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b

[Tim Deegan]

At 13:07 +0100 on 15 Jul (1468588072), Andrew Cooper wrote:
> c/s 2fc002b "xen: Use a typesafe to define INVALID_GFN" changed INVALID_GFN to
> be a boxed type.
> 
> Identified by a Travis randconfig run:
>   https://travis-ci.org/xen-project/xen/jobs/144980445
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Tim Deegan <tim@xen.org>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b

[Julien Grall]

Hi Andrew,

On 15/07/16 13:07, Andrew Cooper wrote:
> c/s 2fc002b "xen: Use a typesafe to define INVALID_GFN" changed INVALID_GFN to
> be a boxed type.
>
> Identified by a Travis randconfig run:
>    https://travis-ci.org/xen-project/xen/jobs/144980445
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Sorry for the breakage:

Reviewed-by: Julien Grall <julien.grall@arm.com>

Regards,


> ---
> CC: Tim Deegan <tim@xen.org>
> CC: George Dunlap <george.dunlap@eu.citrix.com>
> CC: Julien Grall <julien.grall@arm.com>
> ---
>   xen/arch/x86/mm/shadow/none.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c
> index 38bdf92..69e56c5 100644
> --- a/xen/arch/x86/mm/shadow/none.c
> +++ b/xen/arch/x86/mm/shadow/none.c
> @@ -42,7 +42,7 @@ static unsigned long _gva_to_gfn(struct vcpu *v, struct p2m_domain *p2m,
>                                    unsigned long va, uint32_t *pfec)
>   {
>       ASSERT_UNREACHABLE();
> -    return INVALID_GFN;
> +    return gfn_x(INVALID_GFN);
>   }
>
>   static void _update_cr3(struct vcpu *v, int do_locking)
>

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b

[Andrew Cooper]

On 15/07/16 13:33, Julien Grall wrote:
> Hi Andrew,
>
> On 15/07/16 13:07, Andrew Cooper wrote:
>> c/s 2fc002b "xen: Use a typesafe to define INVALID_GFN" changed
>> INVALID_GFN to
>> be a boxed type.
>>
>> Identified by a Travis randconfig run:
>>    https://travis-ci.org/xen-project/xen/jobs/144980445
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> Sorry for the breakage:

No problem.  Breakage like this is always going to happen when making
sweeping improvements like that;  It even slipped through my pre-push
checks.

At least we now have automation in place now which complains.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel