[PATCH] 2/5 move kvm_x86_ops to x86.c

[PATCH] 2/5 move kvm_x86_ops to x86.c

[Zhang, Xiantao]

From: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Move kvm_x86_ops to x86.c
Signed-off-by: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 drivers/kvm/kvm_main.c |    1 -
 drivers/kvm/x86.c      |    2 ++
 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 3a72f58..71a3b7a 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 2fa4f13..92c0988 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 663b822..ec32c26 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)
-- 
1.5.1.2

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/

Re: [PATCH] 2/5 move kvm_x86_ops to x86.c

[Carsten Otte]

Acked-by: Carsten Otte <cotte-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
Zhang, Xiantao wrote:
> From: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Move kvm_x86_ops to x86.c
> Signed-off-by: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>  drivers/kvm/kvm_main.c |    1 -
>  drivers/kvm/x86.c      |    2 ++
>  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 3a72f58..71a3b7a 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 2fa4f13..92c0988 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 663b822..ec32c26 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)


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/