diff options
| author |   Zhang Xiantao <xiantao.zhang@intel.com> | 2007-11-14 20:09:30 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2008-01-30 17:53:02 +0200 |
| commit | 97896d04a14669b146c17d779b81ec7a339deeb3 (patch) | |
| tree | 73853232d2f935fcc35ecf3cd21cfbb278e94be4 | |
| parent | KVM: Portability: Move some includes to x86.c (diff) | |
| download | linux-dev-97896d04a14669b146c17d779b81ec7a339deeb3.tar.xz linux-dev-97896d04a14669b146c17d779b81ec7a339deeb3.zip | |
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>
| -rw-r--r-- | drivers/kvm/kvm_main.c | 1 | ||||
| -rw-r--r-- | drivers/kvm/x86.c | 2 | ||||
| -rw-r--r-- | drivers/kvm/x86.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 6aaba79f8c5a..47a76c3a4c81 100644 --- 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 4282a0fb2962..2edc53ec8b3b 100644 --- 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 663b822b4ddb..ec32c26a5118 100644 --- 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) |