x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b
authorAndrew Cooper <andrew.cooper3@citrix.com>
Fri, 15 Jul 2016 12:07:09 +0000 (13:07 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Fri, 15 Jul 2016 12:25:26 +0000 (13:25 +0100)
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/arch/x86/mm/shadow/none.c

index 38bdf9232c5692106fdbf00cc2bf243c76eef458..69e56c5c4e2cdc439ee636f11ffff3d0d19ca221 100644 (file)
@@ -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)