[Xen-changelog] [xen-4.1-testing] x86/mm: fix mod_l1_entry() return value when encountering r/o MMIO page

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxxxx>
# Date 1341826216 -3600
# Node ID ff523faf2be10a86b4f1452533db2271e0d88ff3
# Parent  1d437f7fb15d1582ed4be5df461fe7d49fba693b
x86/mm: fix mod_l1_entry() return value when encountering r/o MMIO page

While putting together the workaround announced in
http://lists.xen.org/archives/html/xen-devel/2012-06/msg00709.html, I
found that mod_l1_entry(), upon encountering a set bit in
mmio_ro_ranges, would return 1 instead of 0 (the removal of the write
permission is supposed to be entirely transparent to the caller, even
more so to the calling guest).

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
xen-unstable changeset:   25487:baa85434d0ec
xen-unstable date:        Thu Jun 21 11:30:59 2012 +0200
---


diff -r 1d437f7fb15d -r ff523faf2be1 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Mon Jul 09 10:28:50 2012 +0100
+++ b/xen/arch/x86/mm.c Mon Jul 09 10:30:16 2012 +0100
@@ -1801,6 +1801,7 @@ static int mod_l1_entry(l1_pgentry_t *pl
             return 0;
         case -1:
             l1e_remove_flags(nl1e, _PAGE_RW);
+            rc = 0;
             break;
         }
         

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