]> xenbits.xensource.com Git - people/royger/xen.git/commitdiff
x86/mm: don't call HVM-only function for PV guests
authorJan Beulich <jbeulich@suse.com>
Tue, 27 Oct 2015 15:34:29 +0000 (16:34 +0100)
committerJan Beulich <jbeulich@suse.com>
Tue, 27 Oct 2015 15:34:29 +0000 (16:34 +0100)
Somehow I managed to drop the HVM dependency from v2 to v3 of what
became commit 5c23c760a8 ("x86/HVM: correct page dirty marking in
hvm_map_guest_frame_rw()"), obviously breaking migration of PV guests.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
xen/arch/x86/mm/paging.c

index e6f726dff8016051169cd41c723b171b20a46dc7..0bfb2be6521a8261676b85ddafa5fd68617175b3 100644 (file)
@@ -425,7 +425,8 @@ static int paging_log_dirty_op(struct domain *d,
          * Mark dirty all currently write-mapped pages on e.g. the
          * final iteration of a save operation.
          */
-        if ( sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL )
+        if ( has_hvm_container_domain(d) &&
+             (sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL) )
             hvm_mapped_guest_frames_mark_dirty(d);
 
         domain_pause(d);