Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: move APIC types to arch/x86/

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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

+27 -27
+10
arch/x86/include/asm/kvm_host.h
··· 664 664 u64 data; 665 665 }; 666 666 667 + struct kvm_lapic_irq { 668 + u32 vector; 669 + u32 delivery_mode; 670 + u32 dest_mode; 671 + u32 level; 672 + u32 trig_mode; 673 + u32 shorthand; 674 + u32 dest_id; 675 + }; 676 + 667 677 struct kvm_x86_ops { 668 678 int (*cpu_has_kvm_support)(void); /* __init */ 669 679 int (*disabled_by_bios)(void); /* __init */
+17
arch/x86/kvm/ioapic.h
··· 44 44 DECLARE_BITMAP(dest_map, KVM_MAX_VCPUS); 45 45 }; 46 46 47 + union kvm_ioapic_redirect_entry { 48 + u64 bits; 49 + struct { 50 + u8 vector; 51 + u8 delivery_mode:3; 52 + u8 dest_mode:1; 53 + u8 delivery_status:1; 54 + u8 polarity:1; 55 + u8 remote_irr:1; 56 + u8 trig_mode:1; 57 + u8 mask:1; 58 + u8 reserve:7; 59 + u8 reserved[4]; 60 + u8 dest_id; 61 + } fields; 62 + }; 63 + 47 64 struct kvm_ioapic { 48 65 u64 base_address; 49 66 u32 ioregsel;
-27
include/linux/kvm_types.h
··· 54 54 55 55 typedef hfn_t pfn_t; 56 56 57 - union kvm_ioapic_redirect_entry { 58 - u64 bits; 59 - struct { 60 - u8 vector; 61 - u8 delivery_mode:3; 62 - u8 dest_mode:1; 63 - u8 delivery_status:1; 64 - u8 polarity:1; 65 - u8 remote_irr:1; 66 - u8 trig_mode:1; 67 - u8 mask:1; 68 - u8 reserve:7; 69 - u8 reserved[4]; 70 - u8 dest_id; 71 - } fields; 72 - }; 73 - 74 - struct kvm_lapic_irq { 75 - u32 vector; 76 - u32 delivery_mode; 77 - u32 dest_mode; 78 - u32 level; 79 - u32 trig_mode; 80 - u32 shorthand; 81 - u32 dest_id; 82 - }; 83 - 84 57 struct gfn_to_hva_cache { 85 58 u64 generation; 86 59 gpa_t gpa;