aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2012-01-20 18:17:59 +0000
committerKeir Fraser <keir@xen.org>2012-01-20 18:17:59 +0000
commite510f6c58dee33f8a559637fe07108146b44e8e7 (patch)
treed0e9c61bc0a7e6b30df2b0003383e82d375269dc /xen
parentb4960592ac4f1e9c34ae50d6fefd4df92d9601fb (diff)
downloadxen-e510f6c58dee33f8a559637fe07108146b44e8e7.tar.gz
xen-e510f6c58dee33f8a559637fe07108146b44e8e7.tar.bz2
xen-e510f6c58dee33f8a559637fe07108146b44e8e7.zip
x86/hvm: Fix earlier hvm_load_cpu_ctxt() breakage.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen')
-rw-r--r--xen/arch/x86/hvm/hvm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 554afa3ac9..b3d9ac0791 100644
--- 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 )