diff options
author | Avi Kivity <avi@redhat.com> | 2010-07-20 08:06:17 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-24 04:52:54 -0400 |
commit | b463a6f744a263fccd7da14db1afdc880371a280 (patch) | |
tree | 30dbb8d47f4a3a6b2036dd890d03cb53081eadef /arch/x86/include | |
parent | 83422e17c19d61399cab7dbf9bf40ff9af2a7dd2 (diff) |
KVM: Non-atomic interrupt injection
Change the interrupt injection code to work from preemptible, interrupts
enabled context. This works by adding a ->cancel_injection() operation
that undoes an injection in case we were not able to actually enter the guest
(this condition could never happen with atomic injection).
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index b43686a44877..80224bf5d4f8 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
@@ -552,6 +552,7 @@ struct kvm_x86_ops { | |||
552 | void (*queue_exception)(struct kvm_vcpu *vcpu, unsigned nr, | 552 | void (*queue_exception)(struct kvm_vcpu *vcpu, unsigned nr, |
553 | bool has_error_code, u32 error_code, | 553 | bool has_error_code, u32 error_code, |
554 | bool reinject); | 554 | bool reinject); |
555 | void (*cancel_injection)(struct kvm_vcpu *vcpu); | ||
555 | int (*interrupt_allowed)(struct kvm_vcpu *vcpu); | 556 | int (*interrupt_allowed)(struct kvm_vcpu *vcpu); |
556 | int (*nmi_allowed)(struct kvm_vcpu *vcpu); | 557 | int (*nmi_allowed)(struct kvm_vcpu *vcpu); |
557 | bool (*get_nmi_mask)(struct kvm_vcpu *vcpu); | 558 | bool (*get_nmi_mask)(struct kvm_vcpu *vcpu); |