Merge branch 'kvm-lapic-fix-and-cleanup' into HEAD

[linux-block.git] / arch / x86 / include / asm / kvm_host.h

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 7ca854714ccda12af7767aed5d93a55f8e271117..4d2bc08794e45c6ef11cd551ebd9a52f2e8dfc5b 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1123,6 +1123,7 @@ struct msr_bitmap_range {
 
 /* Xen emulation context */
 struct kvm_xen {
+       struct mutex xen_lock;
        u32 xen_version;
        bool long_mode;
        bool runstate_update_flag;
@@ -1535,6 +1536,8 @@ static inline u16 kvm_lapic_irq_dest_mode(bool dest_mode_logical)
 struct kvm_x86_ops {
        const char *name;
 
+       int (*check_processor_compatibility)(void);
+
        int (*hardware_enable)(void);
        void (*hardware_disable)(void);
        void (*hardware_unsetup)(void);
@@ -1748,9 +1751,6 @@ struct kvm_x86_nested_ops {
 };
 
 struct kvm_x86_init_ops {
-       int (*cpu_has_kvm_support)(void);
-       int (*disabled_by_bios)(void);
-       int (*check_processor_compatibility)(void);
        int (*hardware_setup)(void);
        unsigned int (*handle_intel_pt_intr)(void);
 
@@ -1777,6 +1777,9 @@ extern struct kvm_x86_ops kvm_x86_ops;
 #define KVM_X86_OP_OPTIONAL_RET0 KVM_X86_OP
 #include <asm/kvm-x86-ops.h>
 
+int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops);
+void kvm_x86_vendor_exit(void);
+
 #define __KVM_HAVE_ARCH_VM_ALLOC
 static inline struct kvm *kvm_arch_alloc_vm(void)
 {