[Xen-changelog] [xen-unstable] x86 shadow: Minor fix to the fast emulation patch.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1203529099 0
# Node ID 6757307d1adc02957564dcc9b4eddad9178234df
# Parent  3f1cf03826fe642434197f898c3aac55dc81ad25
x86 shadow: Minor fix to the fast emulation patch.

The fast emulation path patch introduced a bug when we have an event
injection during a write to a pagetable: after removing shadows we
still jump to the done label, releasing the lock even if we aren't
grabbing it.

Signed-off-by: Gianluca Guida <gianluca.guida@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/multi.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 3f1cf03826fe -r 6757307d1adc xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Wed Feb 20 14:36:45 2008 +0000
+++ b/xen/arch/x86/mm/shadow/multi.c    Wed Feb 20 17:38:19 2008 +0000
@@ -3019,7 +3019,7 @@ static int sh_page_fault(struct vcpu *v,
                      "injection: cr2=%#lx, mfn=%#lx\n", 
                      va, mfn_x(gmfn));
             sh_remove_shadows(v, gmfn, 0 /* thorough */, 1 /* must succeed */);
-            goto done;
+            return EXCRET_fault_fixed;
         }
     }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog