Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"Two fixes for this merge window, and an unrelated bugfix for a host
hang"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: ioapic: break infinite recursion on lazy EOI
KVM: vmx: rename pi_init to avoid conflict with paride
KVM: x86/mmu: Avoid modulo operator on 64-bit value to fix i386 build
+5
-8
+1
-4
arch/x86/kvm/ioapic.c
+1
-4
arch/x86/kvm/ioapic.c
···
197
197
198
198
/*
199
199
* If no longer has pending EOI in LAPICs, update
200
-
* EOI for this vetor.
200
+
* EOI for this vector.
201
201
*/
202
202
rtc_irq_eoi(ioapic, vcpu, entry->fields.vector);
203
-
kvm_ioapic_update_eoi_one(vcpu, ioapic,
204
-
entry->fields.trig_mode,
205
-
irq);
206
203
break;
207
204
}
208
205
}
+1
-1
arch/x86/kvm/mmu/tdp_mmu.c
+1
-1
arch/x86/kvm/mmu/tdp_mmu.c
+1
-1
arch/x86/kvm/vmx/posted_intr.c
+1
-1
arch/x86/kvm/vmx/posted_intr.c
+1
-1
arch/x86/kvm/vmx/posted_intr.h
+1
-1
arch/x86/kvm/vmx/posted_intr.h
···
91
91
int pi_pre_block(struct kvm_vcpu *vcpu);
92
92
void pi_post_block(struct kvm_vcpu *vcpu);
93
93
void pi_wakeup_handler(void);
94
-
void __init pi_init(int cpu);
94
+
void __init pi_init_cpu(int cpu);
95
95
bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu);
96
96
int pi_update_irte(struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq,
97
97
bool set);