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 <[email protected]>
--- 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 do
* 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);
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 <[email protected]>
--- 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 do
* 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);
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
