From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 13 Aug 2008 10:09:46 +0000 (+0100)
Subject: x86, shadow, oos: Remove overzealous warning and simplify code.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14157^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a87b010c67fa312b5bfd7bd284580c21b0e1c9fd;p=xen.git

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 dec5e9a09f..7736775501 100644
--- 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 )