diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-17 10:31:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-17 10:31:36 -0700 |
| commit | 2fc67756e34f505cbb673435c5b4c9019f969afe (patch) | |
| tree | 74f26538fea9f4d3f057cbfc9d243c03a338695f /include | |
| parent | ab676b7d6fbf4b294bf198fb27ade5b0e865c7ce (diff) | |
| parent | f710a12d73dfa1c3a5d2417f2482b970f03bb850 (diff) | |
| download | linux-2fc67756e34f505cbb673435c5b4c9019f969afe.tar.gz linux-2fc67756e34f505cbb673435c5b4c9019f969afe.tar.bz2 linux-2fc67756e34f505cbb673435c5b4c9019f969afe.zip | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Marcelo Tosatti:
"KVM bug fixes (ARM and x86)"
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
arm/arm64: KVM: Keep elrsr/aisr in sync with software model
KVM: VMX: Set msr bitmap correctly if vcpu is in guest mode
arm/arm64: KVM: fix missing unlock on error in kvm_vgic_create()
kvm: x86: i8259: return initialized data on invalid-size read
arm64: KVM: Fix outdated comment about VTCR_EL2.PS
arm64: KVM: Do not use pgd_index to index stage-2 pgd
arm64: KVM: Fix stage-2 PGD allocation to have per-page refcounting
kvm: move advertising of KVM_CAP_IRQFD to common code
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_vgic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 7c55dd5dd2c9..66203b268984 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -114,6 +114,7 @@ struct vgic_ops { void (*sync_lr_elrsr)(struct kvm_vcpu *, int, struct vgic_lr); u64 (*get_elrsr)(const struct kvm_vcpu *vcpu); u64 (*get_eisr)(const struct kvm_vcpu *vcpu); + void (*clear_eisr)(struct kvm_vcpu *vcpu); u32 (*get_interrupt_status)(const struct kvm_vcpu *vcpu); void (*enable_underflow)(struct kvm_vcpu *vcpu); void (*disable_underflow)(struct kvm_vcpu *vcpu); |