diff options
| author | Paolo Bonzini | 2019-06-20 18:24:18 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-06-20 18:24:18 +0200 |
| commit | b21e31b253048b7f9768ca7cc270e67765fd6ba2 (patch) | |
| tree | 589a0c7f79d7f30db3000f1486f1f222fa5ba60e /virt | |
| parent | KVM: nVMX: reorganize initial steps of vmx_set_nested_state (diff) | |
| parent | KVM: arm/arm64: Fix emulated ptimer irq injection (diff) | |
| download | kernel-qcow2-linux-b21e31b253048b7f9768ca7cc270e67765fd6ba2.tar.gz kernel-qcow2-linux-b21e31b253048b7f9768ca7cc270e67765fd6ba2.tar.xz kernel-qcow2-linux-b21e31b253048b7f9768ca7cc270e67765fd6ba2.zip | |
Merge tag 'kvmarm-fixes-for-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm fixes for 5.2, take #2
- SVE cleanup killing a warning with ancient GCC versions
- Don't report non-existent system registers to userspace
- Fix memory leak when freeing the vgic ITS
- Properly lower the interrupt on the emulated physical timer
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 5 | ||||
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-its.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 7fc272ecae16..1b1c449ceaf4 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -321,14 +321,15 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level, } } +/* Only called for a fully emulated timer */ static void timer_emulate(struct arch_timer_context *ctx) { bool should_fire = kvm_timer_should_fire(ctx); trace_kvm_timer_emulate(ctx, should_fire); - if (should_fire) { - kvm_timer_update_irq(ctx->vcpu, true, ctx); + if (should_fire != ctx->irq.level) { + kvm_timer_update_irq(ctx->vcpu, should_fire, ctx); return; } diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 44ceaccb18cf..8c9fe831bce4 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -1734,6 +1734,7 @@ static void vgic_its_destroy(struct kvm_device *kvm_dev) mutex_unlock(&its->its_lock); kfree(its); + kfree(kvm_dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ } static int vgic_its_has_attr_regs(struct kvm_device *dev, |