KVM: Portability: Move kvm_x86_ops to x86.c

Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Acked-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 6aaba79f8c5aaaa8c43ec17d3cc2d49e320d9bdd..47a76c3a4c8138780a7b57af6970e4f7e3718868 100644 (file)
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -55,7 +55,6 @@ static LIST_HEAD(vm_list);
 
 static cpumask_t cpus_hardware_enabled;
 
-struct kvm_x86_ops *kvm_x86_ops;
 struct kmem_cache *kvm_vcpu_cache;
 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
 

diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c
index 4282a0fb29629bab1080e6409b84086e0cabb8e5..2edc53ec8b3b6c6fffce3d8d9f6e1fc7d3f90b09 100644 (file)
--- a/drivers/kvm/x86.c
+++ b/drivers/kvm/x86.c
@@ -44,6 +44,8 @@
 
 #define STAT_OFFSET(x) offsetof(struct kvm_vcpu, stat.x)
 
+struct kvm_x86_ops *kvm_x86_ops;
+
 struct kvm_stats_debugfs_item debugfs_entries[] = {
        { "pf_fixed", STAT_OFFSET(pf_fixed) },
        { "pf_guest", STAT_OFFSET(pf_guest) },

diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h
index 663b822b4ddbd38a3997a853d27b4c9ff67724b4..ec32c26a51181e56b812948226d76525513de7d9 100644 (file)
--- a/drivers/kvm/x86.h
+++ b/drivers/kvm/x86.h
@@ -85,6 +85,8 @@ struct kvm_vcpu {
        struct x86_emulate_ctxt emulate_ctxt;
 };
 
+extern struct kvm_x86_ops *kvm_x86_ops;
+
 int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code);
 
 static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)