Re: [PATCH for 4.6] x86/hvm.c: fix regression in guest destruction

[Andrew Cooper <andrew.cooper3@citrix.com>]

On 29/07/15 17:39, Ravi Sahita wrote:
> As reported by Wei Lu on July 27 2015

Reported-by: Wei Liu <wei.liu2@citrix.com>

> Signed-off-by: Ravi Sahita <ravi.sahita@intel.com>

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

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