[Xen-changelog] [xen-unstable] x86/hvm: do actually init nested HVM state for VCPUs

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1302172775 -3600
# Node ID 712c8b8945843878847e4d9032bf3b13f2a44c75
# Parent  e5a750d1bf9bb021713c6721000e655a4054ebea
x86/hvm: do actually init nested HVM state for VCPUs
when nested HVM is enabled after VCPus are allocated.
The previous patch would fail because the call to
nestedhvm_vcpu_initialise() in the HVM param set code
happens before nestedhvm_enabled(v->domain) is true.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---


diff -r e5a750d1bf9b -r 712c8b894584 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Thu Apr 07 11:12:55 2011 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Thu Apr 07 11:39:35 2011 +0100
@@ -967,7 +967,8 @@
     if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 )
         goto fail2;
 
-    if ( (rc = nestedhvm_vcpu_initialise(v)) < 0 ) 
+    if ( nestedhvm_enabled(v->domain) 
+         && (rc = nestedhvm_vcpu_initialise(v)) < 0 ) 
         goto fail3;
 
     /* Create ioreq event channel. */
diff -r e5a750d1bf9b -r 712c8b894584 xen/arch/x86/hvm/nestedhvm.c
--- a/xen/arch/x86/hvm/nestedhvm.c      Thu Apr 07 11:12:55 2011 +0100
+++ b/xen/arch/x86/hvm/nestedhvm.c      Thu Apr 07 11:39:35 2011 +0100
@@ -74,9 +74,6 @@
 {
     int rc;
 
-    if ( !nestedhvm_enabled(v->domain) )
-        return 0;
-
     if ( (rc = nhvm_vcpu_initialise(v)) )
     {
         nhvm_vcpu_destroy(v);

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