diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-03-27 19:47:26 -0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-04-05 19:04:09 +0300 |
| commit | 7a4f5ad051e02139a9f1c0f7f4b1acb88915852b (patch) | |
| tree | fe3a336cd04af38e828237a555ef39d1799fe86c /arch | |
| parent | fea5295324ce7ce6ccfe0909cc6740a2d34aa5a3 (diff) | |
| download | linux-7a4f5ad051e02139a9f1c0f7f4b1acb88915852b.tar.gz linux-7a4f5ad051e02139a9f1c0f7f4b1acb88915852b.tar.bz2 linux-7a4f5ad051e02139a9f1c0f7f4b1acb88915852b.zip | |
KVM: VMX: vmx_set_cr0 expects kvm->srcu locked
vmx_set_cr0 is called from vcpu run context, therefore it expects
kvm->srcu to be held (for setting up the real-mode TSS).
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 280751c84724..ad85adfef843 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3906,7 +3906,9 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid); vmx->vcpu.arch.cr0 = X86_CR0_NW | X86_CR0_CD | X86_CR0_ET; + vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); vmx_set_cr0(&vmx->vcpu, kvm_read_cr0(vcpu)); /* enter rmode */ + srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx); vmx_set_cr4(&vmx->vcpu, 0); vmx_set_efer(&vmx->vcpu, 0); vmx_fpu_activate(&vmx->vcpu); |