From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH] x86/mm: don't call HVM-only function for PV
	guests
Date: Tue, 27 Oct 2015 15:27:57 +0000
Message-ID: <562F97FD.6090609@citrix.com>
References: <562FA51C02000078000AF347@prv-mh.provo.novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta14.messagelabs.com ([193.109.254.103])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=7357aa5aa=Andrew.Cooper3@citrix.com>)
	id 1Zr6AL-0001ek-QJ
	for xen-devel@lists.xenproject.org; Tue, 27 Oct 2015 15:28:01 +0000
In-Reply-To: <562FA51C02000078000AF347@prv-mh.provo.novell.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Jan Beulich <JBeulich@suse.com>, xen-devel <xen-devel@lists.xenproject.org>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>, Keir Fraser <keir@xen.org>
List-Id: xen-devel@lists.xenproject.org

On 27/10/15 15:23, Jan Beulich wrote:
> 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>

Oops yes.  Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

>
> --- 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);
>
>
>