From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH for 4.6] x86/hvm.c: fix regression in guest destruction Date: Wed, 29 Jul 2015 17:44:38 +0100 Message-ID: <55B902F6.3040005@citrix.com> References: <1438187962-4047-1-git-send-email-ravi.sahita@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZKUTF-0005U6-5E for xen-devel@lists.xenproject.org; Wed, 29 Jul 2015 16:44:45 +0000 In-Reply-To: <1438187962-4047-1-git-send-email-ravi.sahita@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ravi Sahita , xen-devel@lists.xenproject.org Cc: george.dunlap@eu.citrix.com, tim@xen.org, wei.liu2@citrix.com, edmund.h.white@intel.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org On 29/07/15 17:39, Ravi Sahita wrote: > As reported by Wei Lu on July 27 2015 Reported-by: Wei Liu > Signed-off-by: Ravi Sahita Reviewed-by: Andrew Cooper > --- > xen/arch/x86/hvm/hvm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c > index ec1d797..6a56216 100644 > --- a/xen/arch/x86/hvm/hvm.c > +++ b/xen/arch/x86/hvm/hvm.c > @@ -2463,7 +2463,9 @@ void hvm_vcpu_destroy(struct vcpu *v) > { > hvm_all_ioreq_servers_remove_vcpu(v->domain, v); > > - altp2m_vcpu_destroy(v); > + if ( hvm_altp2m_supported() ) > + altp2m_vcpu_destroy(v); > + > nestedhvm_vcpu_destroy(v); > > free_compat_arg_xlat(v);