Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 024c7e37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fix from Paolo Bonzini:
 "One fix for an x86 regression in VM migration, mostly visible with
  Windows because it uses RTC periodic interrupts"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: x86: correctly reset dest_map->vector when restoring LAPIC state
parents b71dbf10 b0eaf450

arch/x86/kvm/ioapic.c

+5 −3
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static void __rtc_irq_eoi_tracking_restore_one(struct kvm_vcpu *vcpu) 
{

	bool new_val, old_val;

	struct kvm_ioapic *ioapic = vcpu->kvm->arch.vioapic;

	struct dest_map *dest_map = &ioapic->rtc_status.dest_map;

	union kvm_ioapic_redirect_entry *e;



	e = &ioapic->redirtbl[RTC_GSI];
@@ -117,16 +118,17 @@ static void __rtc_irq_eoi_tracking_restore_one(struct kvm_vcpu *vcpu) 
		return;



	new_val = kvm_apic_pending_eoi(vcpu, e->fields.vector);

	old_val = test_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map.map);

	old_val = test_bit(vcpu->vcpu_id, dest_map->map);



	if (new_val == old_val)

		return;



	if (new_val) {

		__set_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map.map);

		__set_bit(vcpu->vcpu_id, dest_map->map);

		dest_map->vectors[vcpu->vcpu_id] = e->fields.vector;

		ioapic->rtc_status.pending_eoi++;

	} else {

		__clear_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map.map);

		__clear_bit(vcpu->vcpu_id, dest_map->map);

		ioapic->rtc_status.pending_eoi--;

		rtc_status_pending_eoi_check_valid(ioapic);

	}