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

Commit 1fcc7890 authored by Yang Zhang's avatar Yang Zhang Committed by Marcelo Tosatti
Browse files

KVM: Add vcpu info to ioapic_update_eoi() 



Add vcpu info to ioapic_update_eoi, so we can know which vcpu
issued this EOI.

Signed-off-by: default avatarYang Zhang <yang.z.zhang@Intel.com>
Reviewed-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent c0d1c770

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static void kvm_ioapic_send_eoi(struct kvm_lapic *apic, int vector) 
			trigger_mode = IOAPIC_LEVEL_TRIG;

		else

			trigger_mode = IOAPIC_EDGE_TRIG;

		kvm_ioapic_update_eoi(apic->vcpu->kvm, vector, trigger_mode);

		kvm_ioapic_update_eoi(apic->vcpu, vector, trigger_mode);

	}

}

virt/kvm/ioapic.c

+6 −6
Original line number Diff line number Diff line
@@ -264,8 +264,8 @@ void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id) 
	spin_unlock(&ioapic->lock);

}



static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int vector,

				     int trigger_mode)

static void __kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu,

			struct kvm_ioapic *ioapic, int vector, int trigger_mode)

{

	int i;
@@ -304,12 +304,12 @@ bool kvm_ioapic_handles_vector(struct kvm *kvm, int vector) 
	return test_bit(vector, ioapic->handled_vectors);

}



void kvm_ioapic_update_eoi(struct kvm *kvm, int vector, int trigger_mode)

void kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu, int vector, int trigger_mode)

{

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

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



	spin_lock(&ioapic->lock);

	__kvm_ioapic_update_eoi(ioapic, vector, trigger_mode);

	__kvm_ioapic_update_eoi(vcpu, ioapic, vector, trigger_mode);

	spin_unlock(&ioapic->lock);

}
@@ -407,7 +407,7 @@ static int ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len, 
		break;

#ifdef	CONFIG_IA64

	case IOAPIC_REG_EOI:

		__kvm_ioapic_update_eoi(ioapic, data, IOAPIC_LEVEL_TRIG);

		__kvm_ioapic_update_eoi(NULL, ioapic, data, IOAPIC_LEVEL_TRIG);

		break;

#endif

virt/kvm/ioapic.h

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) 
int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

		int short_hand, int dest, int dest_mode);

int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);

void kvm_ioapic_update_eoi(struct kvm *kvm, int vector, int trigger_mode);

void kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu, int vector,

			int trigger_mode);

bool kvm_ioapic_handles_vector(struct kvm *kvm, int vector);

int kvm_ioapic_init(struct kvm *kvm);

void kvm_ioapic_destroy(struct kvm *kvm);