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

Commit cb5281a5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: move APIC types to arch/x86/ 



They are not used anymore by IA64, move them away.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 333bce5a

arch/x86/include/asm/kvm_host.h

+10 −0
Original line number Diff line number Diff line
@@ -664,6 +664,16 @@ struct msr_data { 
	u64 data;

};



struct kvm_lapic_irq {

	u32 vector;

	u32 delivery_mode;

	u32 dest_mode;

	u32 level;

	u32 trig_mode;

	u32 shorthand;

	u32 dest_id;

};



struct kvm_x86_ops {

	int (*cpu_has_kvm_support)(void);          /* __init */

	int (*disabled_by_bios)(void);             /* __init */

arch/x86/kvm/ioapic.h

+17 −0
Original line number Diff line number Diff line
@@ -44,6 +44,23 @@ struct rtc_status { 
	DECLARE_BITMAP(dest_map, KVM_MAX_VCPUS);

};



union kvm_ioapic_redirect_entry {

	u64 bits;

	struct {

		u8 vector;

		u8 delivery_mode:3;

		u8 dest_mode:1;

		u8 delivery_status:1;

		u8 polarity:1;

		u8 remote_irr:1;

		u8 trig_mode:1;

		u8 mask:1;

		u8 reserve:7;

		u8 reserved[4];

		u8 dest_id;

	} fields;

};



struct kvm_ioapic {

	u64 base_address;

	u32 ioregsel;

include/linux/kvm_types.h

+0 −27
Original line number Diff line number Diff line
@@ -54,33 +54,6 @@ typedef u64 hfn_t; 


typedef hfn_t pfn_t;



union kvm_ioapic_redirect_entry {

	u64 bits;

	struct {

		u8 vector;

		u8 delivery_mode:3;

		u8 dest_mode:1;

		u8 delivery_status:1;

		u8 polarity:1;

		u8 remote_irr:1;

		u8 trig_mode:1;

		u8 mask:1;

		u8 reserve:7;

		u8 reserved[4];

		u8 dest_id;

	} fields;

};



struct kvm_lapic_irq {

	u32 vector;

	u32 delivery_mode;

	u32 dest_mode;

	u32 level;

	u32 trig_mode;

	u32 shorthand;

	u32 dest_id;

};



struct gfn_to_hva_cache {

	u64 generation;

	gpa_t gpa;