diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-02-05 09:16:07 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-02-05 09:16:07 +0100 |
| commit | 19014daf9fbd8e9bb3c26cb0fdbb993f82471d5a (patch) | |
| tree | 020aaef6f42a4c25860b605d6831a0110eb43c61 /xen/arch/x86/hvm/nestedhvm.c | |
| parent | 40785b88faf43e9589142172a43191251a692542 (diff) | |
| download | xen-19014daf9fbd8e9bb3c26cb0fdbb993f82471d5a.tar.gz xen-19014daf9fbd8e9bb3c26cb0fdbb993f82471d5a.tar.bz2 xen-19014daf9fbd8e9bb3c26cb0fdbb993f82471d5a.zip | |
Revert 26503:69398345c10e
This conflicts with changes done in 26486:7648ef657fe7 and
26489:83a3fa9c8434 (i.e. the code added by them needs adjustment in
order for the change here to be correct).
Diffstat (limited to 'xen/arch/x86/hvm/nestedhvm.c')
| -rw-r--r-- | xen/arch/x86/hvm/nestedhvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/hvm/nestedhvm.c b/xen/arch/x86/hvm/nestedhvm.c index 964f58f1a5..b3cf07dda3 100644 --- a/xen/arch/x86/hvm/nestedhvm.c +++ b/xen/arch/x86/hvm/nestedhvm.c @@ -87,7 +87,7 @@ nestedhvm_vcpu_initialise(struct vcpu *v) void nestedhvm_vcpu_destroy(struct vcpu *v) { - if ( hvm_funcs.nhvm_vcpu_destroy ) + if ( nestedhvm_enabled(v->domain) && hvm_funcs.nhvm_vcpu_destroy ) hvm_funcs.nhvm_vcpu_destroy(v); } |