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

Commit 16d7a191 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Fix userspace IRQ chip migration 



Re-put pending IRQ vector into interrupt_bitmap before migration.
Otherwise it will be lost if migration happens in the wrong time.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 95ba8273

arch/x86/kvm/x86.c

+6 −6
Original line number Diff line number Diff line
@@ -3566,17 +3566,17 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
	sregs->efer = vcpu->arch.shadow_efer;

	sregs->apic_base = kvm_get_apic_base(vcpu);



	if (irqchip_in_kernel(vcpu->kvm)) {

	if (irqchip_in_kernel(vcpu->kvm))

		memset(sregs->interrupt_bitmap, 0,

		       sizeof sregs->interrupt_bitmap);

		pending_vec = kvm_x86_ops->get_irq(vcpu);

		if (pending_vec >= 0)

			set_bit(pending_vec,

				(unsigned long *)sregs->interrupt_bitmap);

	} else

	else

		memcpy(sregs->interrupt_bitmap, vcpu->arch.irq_pending,

		       sizeof sregs->interrupt_bitmap);



	pending_vec = kvm_x86_ops->get_irq(vcpu);

	if (pending_vec >= 0)

		set_bit(pending_vec, (unsigned long *)sregs->interrupt_bitmap);



	vcpu_put(vcpu);



	return 0;