x86, shadow, oos: Remove overzealous warning and simplify code.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index dec5e9a09f1381c81897041250af456d67f60819..77367755016ab54e72875cd37a65d4bf4e47a852 100644 (file)
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -3181,14 +3181,9 @@ static int sh_page_fault(struct vcpu *v,
     rc = guest_walk_tables(v, va, &gw, regs->error_code);
 
 #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC)
+    regs->error_code &= ~PFEC_page_present;
     if ( !(rc & _PAGE_PRESENT) )
         regs->error_code |= PFEC_page_present;
-    else if ( regs->error_code & PFEC_page_present )
-    {
-            SHADOW_ERROR("OOS paranoia: Something is wrong in guest TLB"
-                         " flushing. Have fun debugging it.\n");
-            regs->error_code &= ~PFEC_page_present;
-    }
 #endif
 
     if ( rc != 0 )