Messages in this thread | | | Subject | linux-next: manual merge of the kvm tree with the tip tree | From | Michael Ellerman <> | Date | Fri, 19 Jun 2015 14:59:57 +1000 |
| |
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kvm/lapic.c
between commit:
b6ac06953221 "KVM: x86: fix lapic.timer_mode on restore"
from the tip tree and commit:
90de4a187518 "KVM: x86: Support for disabling quirks"
from the kvm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
cheers
diff --cc arch/x86/kvm/lapic.c index 4c7deb4f78a1,beeef05bb4d9..000000000000 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@@ -1581,9 -1588,10 +1593,11 @@@ void kvm_lapic_reset(struct kvm_vcpu *v for (i = 0; i < APIC_LVT_NUM; i++) apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED); - apic->lapic_timer.timer_mode = 0; ++ + apic_update_lvtt(apic); - apic_set_reg(apic, APIC_LVT0, - SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT)); + if (!(vcpu->kvm->arch.disabled_quirks & KVM_QUIRK_LINT0_REENABLED)) + apic_set_reg(apic, APIC_LVT0, + SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT)); apic_set_reg(apic, APIC_DFR, 0xffffffffU); apic_set_spiv(apic, 0xff);
| |