x86: Make sure log-dirty is turned off before trying to dismantle it

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Committed-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index ca879f971f8fca9eb8977154346c49bbd1daa21c..60d0180e8b816db986f771db3eb48184d54c8077 100644 (file)
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -722,6 +722,10 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
 /* Call when destroying a domain */
 void paging_teardown(struct domain *d)
 {
+    /* Make sure log-dirty is turned off before trying to dismantle it. 
+     * Needs to be done here becuse it's covered by the hap/shadow lock */
+    d->arch.paging.log_dirty.disable_log_dirty(d);
+
     if ( hap_enabled(d) )
         hap_teardown(d);
     else