x86/hvm: Fix earlier hvm_load_cpu_ctxt() breakage.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 554afa3ac927d7e088ab780f7184502ec23c0e87..b3d9ac079130d9c1443e4f66544dcbc7e1b87fa4 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -686,7 +686,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h)
 
     /* Need to init this vcpu before loading its contents */
     rc = boot_vcpu(d, vcpuid, NULL);
-    if ( rc != 0 )
+    if ( (rc != 0) && (rc != -EEXIST) )
         return rc;
 
     if ( hvm_load_entry(CPU, h, &ctxt) != 0 )