summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2010-05-05 16:04:41 +0200
committerAvi Kivity <avi@redhat.com>2010-05-19 11:36:37 +0300
commit3f0fd2927b737c0ac2e04af7858b60d1e927d4b1 (patch)
tree55e0f81f014141d94ee6cc4edb885c196a0e644b /arch/x86/kvm
parent9ed3c444ab8987c7b219173a2f7807e3f71e234e (diff)
downloadblackbird-op-linux-3f0fd2927b737c0ac2e04af7858b60d1e927d4b1.tar.gz
blackbird-op-linux-3f0fd2927b737c0ac2e04af7858b60d1e927d4b1.zip
KVM: x86: Fix exception reinjection forced to true
The patch merged recently which allowed to mark an exception as reinjected has a bug as it always marks the exception as reinjected. This breaks nested-svm shadow-on-shadow implementation. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/x86.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 54f73b6a006b..161ede2b5f91 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -277,7 +277,7 @@ static void kvm_multiple_exception(struct kvm_vcpu *vcpu,
vcpu->arch.exception.has_error_code = has_error;
vcpu->arch.exception.nr = nr;
vcpu->arch.exception.error_code = error_code;
- vcpu->arch.exception.reinject = true;
+ vcpu->arch.exception.reinject = reinject;
return;
}
OpenPOWER on IntegriCloud