[Xen-changelog] [xen master] x86/mm: don't call HVM-only function for PV guests

[patchbot@xxxxxxx]

commit bf0d4923d7783ece38bb8f3b832e8df0f3fc284b
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Oct 27 16:34:29 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Oct 27 16:34:29 2015 +0100

    x86/mm: don't call HVM-only function for PV guests
    
    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@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/mm/paging.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index e6f726d..0bfb2be 100644
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -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);
--
generated by git-patchbot for /home/xen/git/xen.git#master

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