public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] 1/5 Move some includes to x86.c from kvm_main.c, since the related functions have been moved to x86.c
@ 2007-11-14  5:43 Zhang, Xiantao
       [not found] ` <42DFA526FC41B1429CE7279EF83C6BDC94FAC8-wq7ZOvIWXbMAbVU2wMM1CrfspsVTdybXVpNB7YpNyf8@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Zhang, Xiantao @ 2007-11-14  5:43 UTC (permalink / raw)
  To: Avi Kivity
  Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
	carsteno-tA70FqPdS9bQT0dZR+AlfA, Hollis Blanchard

From: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Move some includes to x86.c from kvm_main.c, since the related functions
have been moved to x86.c
Signed-off-by: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 drivers/kvm/kvm_main.c |    2 --
 drivers/kvm/x86.c      |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index fb939ab..3a72f58 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -17,7 +17,6 @@
 
 #include "kvm.h"
 #include "x86.h"
-#include "x86_emulate.h"
 #include "irq.h"
 
 #include <linux/kvm.h>
@@ -44,7 +43,6 @@
 #include <linux/mman.h>
 
 #include <asm/processor.h>
-#include <asm/msr.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/desc.h>
diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c
index aa6c3d8..2fa4f13 100644
--- a/drivers/kvm/x86.c
+++ b/drivers/kvm/x86.c
@@ -16,6 +16,7 @@
 
 #include "kvm.h"
 #include "x86.h"
+#include "x86_emulate.h"
 #include "segment_descriptor.h"
 #include "irq.h"
 
@@ -25,6 +26,7 @@
 #include <linux/module.h>
 
 #include <asm/uaccess.h>
+#include <asm/msr.h>
 
 #define MAX_IO_MSRS 256
 #define CR0_RESERVED_BITS
\
-- 
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/

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] 1/5 Move some includes to x86.c from kvm_main.c, since the related functions have been moved to x86.c
       [not found] ` <42DFA526FC41B1429CE7279EF83C6BDC94FAC8-wq7ZOvIWXbMAbVU2wMM1CrfspsVTdybXVpNB7YpNyf8@public.gmane.org>
@ 2007-11-14  9:17   ` Carsten Otte
  0 siblings, 0 replies; 2+ messages in thread
From: Carsten Otte @ 2007-11-14  9:17 UTC (permalink / raw)
  To: Zhang, Xiantao
  Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
	carsteno-tA70FqPdS9bQT0dZR+AlfA, Hollis Blanchard, Avi Kivity

*Ouch*. Looks like I caused that. Very good.
Acked-by: Carsten Otte <cotte-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>

Zhang, Xiantao wrote:
> From: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Move some includes to x86.c from kvm_main.c, since the related functions
> have been moved to x86.c
> Signed-off-by: Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>  drivers/kvm/kvm_main.c |    2 --
>  drivers/kvm/x86.c      |    2 ++
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
> index fb939ab..3a72f58 100644
> --- a/drivers/kvm/kvm_main.c
> +++ b/drivers/kvm/kvm_main.c
> @@ -17,7 +17,6 @@
>  
>  #include "kvm.h"
>  #include "x86.h"
> -#include "x86_emulate.h"
>  #include "irq.h"
>  
>  #include <linux/kvm.h>
> @@ -44,7 +43,6 @@
>  #include <linux/mman.h>
>  
>  #include <asm/processor.h>
> -#include <asm/msr.h>
>  #include <asm/io.h>
>  #include <asm/uaccess.h>
>  #include <asm/desc.h>
> diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c
> index aa6c3d8..2fa4f13 100644
> --- a/drivers/kvm/x86.c
> +++ b/drivers/kvm/x86.c
> @@ -16,6 +16,7 @@
>  
>  #include "kvm.h"
>  #include "x86.h"
> +#include "x86_emulate.h"
>  #include "segment_descriptor.h"
>  #include "irq.h"
>  
> @@ -25,6 +26,7 @@
>  #include <linux/module.h>
>  
>  #include <asm/uaccess.h>
> +#include <asm/msr.h>
>  
>  #define MAX_IO_MSRS 256
>  #define CR0_RESERVED_BITS
> \


-------------------------------------------------------------------------
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/

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-11-14  9:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-14  5:43 [PATCH] 1/5 Move some includes to x86.c from kvm_main.c, since the related functions have been moved to x86.c Zhang, Xiantao
     [not found] ` <42DFA526FC41B1429CE7279EF83C6BDC94FAC8-wq7ZOvIWXbMAbVU2wMM1CrfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2007-11-14  9:17   ` Carsten Otte

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox