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

Commit 6ef768fa authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: x86: move ioapic.c and irq_comm.c back to arch/x86/ 



ia64 does not need them anymore.  Ack notifiers become x86-specific
too.

Suggested-by: default avatarGleb Natapov <gleb@kernel.org>
Reviewed-by: default avatarRadim Krcmar <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c32a4272

arch/x86/include/asm/kvm_host.h

+16 −0
Original line number Original line Diff line number Diff line
@@ -603,6 +603,9 @@ struct kvm_arch { 




	struct kvm_xen_hvm_config xen_hvm_config;

	struct kvm_xen_hvm_config xen_hvm_config;





	/* reads protected by irq_srcu, writes by irq_lock */

	struct hlist_head mask_notifier_list;



	/* fields used by HYPER-V emulation */

	/* fields used by HYPER-V emulation */

	u64 hv_guest_os_id;

	u64 hv_guest_os_id;

	u64 hv_hypercall;

	u64 hv_hypercall;
@@ -819,6 +822,19 @@ int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa, 
			  const void *val, int bytes);

			  const void *val, int bytes);

u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);

u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);





struct kvm_irq_mask_notifier {

	void (*func)(struct kvm_irq_mask_notifier *kimn, bool masked);

	int irq;

	struct hlist_node link;

};



void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,

				    struct kvm_irq_mask_notifier *kimn);

void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,

				      struct kvm_irq_mask_notifier *kimn);

void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin,

			     bool mask);



extern bool tdp_enabled;

extern bool tdp_enabled;





u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu);

u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu);

arch/x86/kvm/Makefile

+2 −3
Original line number Original line Diff line number Diff line
@@ -7,14 +7,13 @@ CFLAGS_vmx.o := -I. 




KVM := ../../../virt/kvm

KVM := ../../../virt/kvm





kvm-y			+= $(KVM)/kvm_main.o $(KVM)/ioapic.o \

kvm-y			+= $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \

				$(KVM)/coalesced_mmio.o $(KVM)/irq_comm.o \

				$(KVM)/eventfd.o $(KVM)/irqchip.o $(KVM)/vfio.o

				$(KVM)/eventfd.o $(KVM)/irqchip.o $(KVM)/vfio.o

kvm-$(CONFIG_KVM_DEVICE_ASSIGNMENT)	+= $(KVM)/assigned-dev.o $(KVM)/iommu.o

kvm-$(CONFIG_KVM_DEVICE_ASSIGNMENT)	+= $(KVM)/assigned-dev.o $(KVM)/iommu.o

kvm-$(CONFIG_KVM_ASYNC_PF)	+= $(KVM)/async_pf.o

kvm-$(CONFIG_KVM_ASYNC_PF)	+= $(KVM)/async_pf.o





kvm-y			+= x86.o mmu.o emulate.o i8259.o irq.o lapic.o \

kvm-y			+= x86.o mmu.o emulate.o i8259.o irq.o lapic.o \

			   i8254.o cpuid.o pmu.o

			   i8254.o ioapic.o irq_comm.o cpuid.o pmu.o

kvm-intel-y		+= vmx.o

kvm-intel-y		+= vmx.o

kvm-amd-y		+= svm.o

kvm-amd-y		+= svm.o

virt/kvm/ioapic.c→arch/x86/kvm/ioapic.c

+0 −0

File moved.

View file

virt/kvm/ioapic.h→arch/x86/kvm/ioapic.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, 
		struct kvm_lapic_irq *irq, unsigned long *dest_map);

		struct kvm_lapic_irq *irq, unsigned long *dest_map);

int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);

int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);

int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);

int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);

void kvm_vcpu_request_scan_ioapic(struct kvm *kvm);

void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap,

void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap,

			u32 *tmr);

			u32 *tmr);

virt/kvm/irq_comm.c→arch/x86/kvm/irq_comm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq, 
{

{

	mutex_lock(&kvm->irq_lock);

	mutex_lock(&kvm->irq_lock);

	kimn->irq = irq;

	kimn->irq = irq;

	hlist_add_head_rcu(&kimn->link, &kvm->mask_notifier_list);

	hlist_add_head_rcu(&kimn->link, &kvm->arch.mask_notifier_list);

	mutex_unlock(&kvm->irq_lock);

	mutex_unlock(&kvm->irq_lock);

}

}
@@ -256,7 +256,7 @@ void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin, 
	idx = srcu_read_lock(&kvm->irq_srcu);

	idx = srcu_read_lock(&kvm->irq_srcu);

	gsi = kvm_irq_map_chip_pin(kvm, irqchip, pin);

	gsi = kvm_irq_map_chip_pin(kvm, irqchip, pin);

	if (gsi != -1)

	if (gsi != -1)

		hlist_for_each_entry_rcu(kimn, &kvm->mask_notifier_list, link)

		hlist_for_each_entry_rcu(kimn, &kvm->arch.mask_notifier_list, link)

			if (kimn->irq == gsi)

			if (kimn->irq == gsi)

				kimn->func(kimn, mask);

				kimn->func(kimn, mask);

	srcu_read_unlock(&kvm->irq_srcu, idx);

	srcu_read_unlock(&kvm->irq_srcu, idx);