diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-07-21 10:43:07 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-05 13:59:45 +0300 |
| commit | 263799a3616242201e20fd2025fe84047b1379b1 (patch) | |
| tree | d030af0a305b71ec547ccf6f702af8d4ca151742 /arch/x86 | |
| parent | 34f0c1ad27a74bd5eb0f99ea43ab6a4658d6419d (diff) | |
| download | op-kernel-dev-263799a3616242201e20fd2025fe84047b1379b1.zip op-kernel-dev-263799a3616242201e20fd2025fe84047b1379b1.tar.gz | |
KVM: VMX: Fix locking imbalance on emulation failure
We have to disable preemption and IRQs on every exit from
handle_invalid_guest_state, otherwise we generate at least a
preempt_disable imbalance.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 6bf58c0..29f9129 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3168,7 +3168,7 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu, if (err != EMULATE_DONE) { kvm_report_emulation_failure(vcpu, "emulation failure"); - return; + break; } if (signal_pending(current)) |
