RFC/patch 1/2: remove desc.h include in kvm_main.c

RFC/patch 1/2: remove desc.h include in kvm_main.c

[Carsten Otte]

This patch removes the include of asm/desc.h in kvm_main.c, which is
only available for x86 and not needed anymore.

Signed-off-by: Carsten Otte <cotte-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
--- 
 kvm_main.c |    1 -
 1 file changed, 1 deletion(-)
Index: kvm/drivers/kvm/kvm_main.c
===================================================================
--- kvm.orig/drivers/kvm/kvm_main.c	2007-11-22 15:15:54.000000000 +0100
+++ kvm/drivers/kvm/kvm_main.c	2007-11-22 15:22:51.000000000 +0100
@@ -45,7 +45,6 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/desc.h>
 #include <asm/pgtable.h>
 
 MODULE_AUTHOR("Qumranet");



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

RFC/patch 2/2: remove irq.h include in kvm_main.c

[Carsten Otte]

This patch removes the include of "irq.h" in kvm_main.c, s390 does not
have irqs. For that, kvm_cpu_has_interrupt becomes an architecutre
specific function which can check for external or I/O interrupts on s390
and for irqs on x86 and others. In order to clarify wording, the
function defined by irq.h has been renamed to kvm_cpu_has_irq.

Signed-off-by: Carsten Otte <cotte-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
--- 
 irq.c      |    4 ++--
 irq.h      |    2 +-
 kvm_main.c |    3 +--
 svm.c      |    2 +-
 vmx.c      |    2 +-
 x86.c      |    4 ++++
 x86.h      |    2 ++
 7 files changed, 12 insertions(+), 7 deletions(-)
Index: kvm/drivers/kvm/irq.c
===================================================================
--- kvm.orig/drivers/kvm/irq.c	2007-11-22 15:24:42.000000000 +0100
+++ kvm/drivers/kvm/irq.c	2007-11-22 15:40:40.000000000 +0100
@@ -29,7 +29,7 @@
  * check if there is pending interrupt without
  * intack.
  */
-int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
+int kvm_cpu_has_irq(struct kvm_vcpu *v)
 {
 	struct kvm_pic *s;
 
@@ -42,7 +42,7 @@
 	}
 	return 1;
 }
-EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt);
+EXPORT_SYMBOL_GPL(kvm_cpu_has_irq);
 
 /*
  * Read pending interrupt vector and intack.
Index: kvm/drivers/kvm/irq.h
===================================================================
--- kvm.orig/drivers/kvm/irq.h	2007-11-22 15:24:42.000000000 +0100
+++ kvm/drivers/kvm/irq.h	2007-11-22 15:37:43.000000000 +0100
@@ -58,7 +58,7 @@
 void kvm_pic_set_irq(void *opaque, int irq, int level);
 int kvm_pic_read_irq(struct kvm_pic *s);
 int kvm_cpu_get_interrupt(struct kvm_vcpu *v);
-int kvm_cpu_has_interrupt(struct kvm_vcpu *v);
+int kvm_cpu_has_irq(struct kvm_vcpu *v);
 void kvm_pic_update_irq(struct kvm_pic *s);
 
 #define IOAPIC_NUM_PINS  KVM_IOAPIC_NUM_PINS
Index: kvm/drivers/kvm/kvm_main.c
===================================================================
--- kvm.orig/drivers/kvm/kvm_main.c	2007-11-22 15:24:43.000000000 +0100
+++ kvm/drivers/kvm/kvm_main.c	2007-11-22 15:44:49.000000000 +0100
@@ -17,7 +17,6 @@
 
 #include "kvm.h"
 #include "x86.h"
-#include "irq.h"
 
 #include <linux/kvm.h>
 #include <linux/module.h>
@@ -656,7 +655,7 @@
 	/*
 	 * We will block until either an interrupt or a signal wakes us up
 	 */
-	while (!kvm_cpu_has_interrupt(vcpu)
+	while (!kvm_arch_cpu_has_interrupt(vcpu)
 	       && !signal_pending(current)
 	       && vcpu->mp_state != VCPU_MP_STATE_RUNNABLE
 	       && vcpu->mp_state != VCPU_MP_STATE_SIPI_RECEIVED) {
Index: kvm/drivers/kvm/svm.c
===================================================================
--- kvm.orig/drivers/kvm/svm.c	2007-11-22 15:24:43.000000000 +0100
+++ kvm/drivers/kvm/svm.c	2007-11-22 15:38:52.000000000 +0100
@@ -1338,7 +1338,7 @@
 	if (vmcb->control.int_ctl & V_IRQ_MASK)
 		return;
 
-	if (!kvm_cpu_has_interrupt(vcpu))
+	if (!kvm_cpu_has_irq(vcpu))
 		return;
 
 	if (!(vmcb->save.rflags & X86_EFLAGS_IF) ||
Index: kvm/drivers/kvm/vmx.c
===================================================================
--- kvm.orig/drivers/kvm/vmx.c	2007-11-22 15:24:43.000000000 +0100
+++ kvm/drivers/kvm/vmx.c	2007-11-22 15:39:44.000000000 +0100
@@ -2244,7 +2244,7 @@
 
 	update_tpr_threshold(vcpu);
 
-	has_ext_irq = kvm_cpu_has_interrupt(vcpu);
+	has_ext_irq = kvm_cpu_has_irq(vcpu);
 	intr_info_field = vmcs_read32(VM_ENTRY_INTR_INFO_FIELD);
 	idtv_info_field = vmcs_read32(IDT_VECTORING_INFO_FIELD);
 	if (intr_info_field & INTR_INFO_VALID_MASK) {
Index: kvm/drivers/kvm/x86.c
===================================================================
--- kvm.orig/drivers/kvm/x86.c	2007-11-22 15:24:43.000000000 +0100
+++ kvm/drivers/kvm/x86.c	2007-11-22 15:37:46.000000000 +0100
@@ -2917,6 +2917,10 @@
 	return kvm;
 }
 
+int kvm_arch_cpu_has_interrupt(struct kvm_vcpu *v) {
+	return kvm_cpu_has_irq(v);
+}
+
 static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
 {
 	vcpu_load(vcpu);
Index: kvm/drivers/kvm/x86.h
===================================================================
--- kvm.orig/drivers/kvm/x86.h	2007-11-22 15:24:43.000000000 +0100
+++ kvm/drivers/kvm/x86.h	2007-11-22 15:37:47.000000000 +0100
@@ -315,6 +315,8 @@
 
 int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code);
 
+int kvm_arch_cpu_has_interrupt(struct kvm_vcpu *v);
+
 static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
 {
 	if (unlikely(vcpu->kvm->n_free_mmu_pages < KVM_MIN_FREE_MMU_PAGES))



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 1/2: remove desc.h include in kvm_main.c

[Avi Kivity]

Carsten Otte wrote:
> This patch removes the include of asm/desc.h in kvm_main.c, which is
> only available for x86 and not needed anymore.
>
>   

Applied, thanks.


-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 2/2: remove irq.h include in kvm_main.c

[Avi Kivity]

Carsten Otte wrote:
> This patch removes the include of "irq.h" in kvm_main.c, s390 does not
> have irqs. For that, kvm_cpu_has_interrupt becomes an architecutre
> specific function which can check for external or I/O interrupts on s390
> and for irqs on x86 and others. In order to clarify wording, the
> function defined by irq.h has been renamed to kvm_cpu_has_irq.
>   

I generally understand "irq" to mean the interrupt request line, and 
"interrupt" to mean a vectored interrupt (post interrupt controller).  
In those terms the naming in correct.  However I'm not at all certain 
this naming convention is generally accepted.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 2/2: remove irq.h include in kvm_main.c

[Cornelia Huck]

On Thu, 22 Nov 2007 18:37:13 +0200,
Avi Kivity <avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org> wrote:

> Carsten Otte wrote:
> > This patch removes the include of "irq.h" in kvm_main.c, s390 does not
> > have irqs. For that, kvm_cpu_has_interrupt becomes an architecutre
> > specific function which can check for external or I/O interrupts on s390
> > and for irqs on x86 and others. In order to clarify wording, the
> > function defined by irq.h has been renamed to kvm_cpu_has_irq.
> >   
> 
> I generally understand "irq" to mean the interrupt request line, and 
> "interrupt" to mean a vectored interrupt (post interrupt controller).  
> In those terms the naming in correct.  However I'm not at all certain 
> this naming convention is generally accepted.

Well, at least IO-Interrupts on s390 don't really fit this model from my
point of view. (In fact, we can even get IO-Interrupts that are not
associated with any (channel) device at all).

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 2/2: remove irq.h include in kvm_main.c

[Avi Kivity]

Cornelia Huck wrote:
>> Carsten Otte wrote:
>>     
>>> This patch removes the include of "irq.h" in kvm_main.c, s390 does not
>>> have irqs. For that, kvm_cpu_has_interrupt becomes an architecutre
>>> specific function which can check for external or I/O interrupts on s390
>>> and for irqs on x86 and others. In order to clarify wording, the
>>> function defined by irq.h has been renamed to kvm_cpu_has_irq.
>>>   
>>>       
>> I generally understand "irq" to mean the interrupt request line, and 
>> "interrupt" to mean a vectored interrupt (post interrupt controller).  
>> In those terms the naming in correct.  However I'm not at all certain 
>> this naming convention is generally accepted.
>>     
>
> Well, at least IO-Interrupts on s390 don't really fit this model from my
> point of view. (In fact, we can even get IO-Interrupts that are not
> associated with any (channel) device at all).
>   

Oh, I agree about the removal, just wondering about the name change.


-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 2/2: remove irq.h include in kvm_main.c

[Carsten Otte]

Avi Kivity wrote:
> I generally understand "irq" to mean the interrupt request line, and 
> "interrupt" to mean a vectored interrupt (post interrupt controller).  
> In those terms the naming in correct.  However I'm not at all certain 
> this naming convention is generally accepted.
I think on s390 we'll have

kvm_s390_vcpu_has_extint()
kvm_s390_vcpu_has_ioint()
and maybe
kvm_s390_vcpu_has_machine_check()

and kvm_arch_vcpu_has_interrupt() will check if any of above is 
pending. It would be great if the function names would clearly 
identify that one is the general portable "cpu needs to run an 
interrupt handler of whatever sort" and the other one is "we have a 
vectored interrupt to deliver" on x86 as well. If you'd like to keep 
the wording as is, I'll send a patch that just adds the 
kvm_arch_cpu_has_interrupt wrapper.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 2/2: remove irq.h include in kvm_main.c

[Avi Kivity]

Avi Kivity wrote:
> Cornelia Huck wrote:
>>> Carsten Otte wrote:
>>>    
>>>> This patch removes the include of "irq.h" in kvm_main.c, s390 does not
>>>> have irqs. For that, kvm_cpu_has_interrupt becomes an architecutre
>>>> specific function which can check for external or I/O interrupts on 
>>>> s390
>>>> and for irqs on x86 and others. In order to clarify wording, the
>>>> function defined by irq.h has been renamed to kvm_cpu_has_irq.
>>>>         
>>> I generally understand "irq" to mean the interrupt request line, and 
>>> "interrupt" to mean a vectored interrupt (post interrupt 
>>> controller).  In those terms the naming in correct.  However I'm not 
>>> at all certain this naming convention is generally accepted.
>>>     
>>
>> Well, at least IO-Interrupts on s390 don't really fit this model from my
>> point of view. (In fact, we can even get IO-Interrupts that are not
>> associated with any (channel) device at all).
>>   
>
> Oh, I agree about the removal, just wondering about the name change.
>
>

Sorry, I misunderstood what you were saying.  Anyway I'm not at all sure 
that the way I understand the names "irq" and "interrupt" is correct.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 2/2: remove irq.h include in kvm_main.c

[Avi Kivity]

Carsten Otte wrote:
> Avi Kivity wrote:
>> I generally understand "irq" to mean the interrupt request line, and 
>> "interrupt" to mean a vectored interrupt (post interrupt 
>> controller).  In those terms the naming in correct.  However I'm not 
>> at all certain this naming convention is generally accepted.
> I think on s390 we'll have
>
> kvm_s390_vcpu_has_extint()
> kvm_s390_vcpu_has_ioint()
> and maybe
> kvm_s390_vcpu_has_machine_check()
>
> and kvm_arch_vcpu_has_interrupt() will check if any of above is 
> pending. It would be great if the function names would clearly 
> identify that one is the general portable "cpu needs to run an 
> interrupt handler of whatever sort" and the other one is "we have a 
> vectored interrupt to deliver" on x86 as well. If you'd like to keep 
> the wording as is, I'll send a patch that just adds the 
> kvm_arch_cpu_has_interrupt wrapper.

What I'd like is to find out what the generally accepted terminology is, 
and conform to that.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 2/2: remove irq.h include in kvm_main.c

[Cornelia Huck]

On Thu, 22 Nov 2007 17:42:30 +0100,
Cornelia Huck <cornelia.huck-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org> wrote:

Argh, please ignore. Was deep in something else and became confused.

Sorry about the noise.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: RFC/patch 1/2: remove desc.h include in kvm_main.c

[Zhang, Xiantao]

Carsten Otte wrote:
> This patch removes the include of asm/desc.h in kvm_main.c, which is
> only available for x86 and not needed anymore.
> 
> Signed-off-by: Carsten Otte <cotte-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
> ---
>  kvm_main.c |    1 -
>  1 file changed, 1 deletion(-)
> Index: kvm/drivers/kvm/kvm_main.c
> ===================================================================
> --- kvm.orig/drivers/kvm/kvm_main.c	2007-11-22 15:15:54.000000000
> +0100 +++ kvm/drivers/kvm/kvm_main.c	2007-11-22 15:22:51.000000000
> +0100 @@ -45,7 +45,6 @@
>  #include <asm/processor.h>
>  #include <asm/io.h>
>  #include <asm/uaccess.h>
> -#include <asm/desc.h>
>  #include <asm/pgtable.h>
> 
>  MODULE_AUTHOR("Qumranet");

Acked-by Zhang Xiantao <xiantao.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/