[Xen-changelog] [xen master] x86/hvm.c: Don't tear down altp2m state if it was never set up

[patchbot@xxxxxxx]

commit 211ce257be739447f85f17dec3a2ac604d1c8442
Author:     Ravi Sahita <ravi.sahita@xxxxxxxxx>
AuthorDate: Wed Jul 29 09:39:22 2015 -0700
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Jul 30 10:12:11 2015 +0100

    x86/hvm.c: Don't tear down altp2m state if it was never set up
    
    Reported-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Signed-off-by: Ravi Sahita <ravi.sahita@xxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Tested-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    [ ijc -- replacement subject from Andy ]
---
 xen/arch/x86/hvm/hvm.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

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);
--
generated by git-patchbot for /home/xen/git/xen.git#master

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