[PATCH] Add ifdef in irqchip struct for x86 only structures

[PATCH] Add ifdef in irqchip struct for x86 only structures

[Jerone Young]

# HG changeset patch
# User Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
# Date 1196087575 21600
# Node ID ccf9dd8a8e0a4513090d44d52c879fb9dfbb79dd
# Parent  32d8bd91d9441d2a3655593a0aaf99f6c403d70f
Add ifdef in irqchip struct for x86 only structures.

This patch fixes a small issue where sturctures:
	kvm_pic_state
	kvm_ioapic_state

are defined inside x86 specific code and may or may not
be defined in anyway for other architectures. The problem
caused is one cannot compile userspace apps (ex. libkvm)
for other archs since a size cannot be determined for these
structures.

Signed-off-by: Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -51,8 +51,10 @@ struct kvm_irqchip {
 	__u32 pad;
         union {
 		char dummy[512];  /* reserving space */
+#if defined(__i386__) || defined(__x86_64__)
 		struct kvm_pic_state pic;
 		struct kvm_ioapic_state ioapic;
+#endif
 	} chip;
 };
 

-------------------------------------------------------------------------
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: [PATCH] Add ifdef in irqchip struct for x86 only structures

[Avi Kivity]

Jerone Young wrote:
> # HG changeset patch
> # User Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> # Date 1196087575 21600
> # Node ID ccf9dd8a8e0a4513090d44d52c879fb9dfbb79dd
> # Parent  32d8bd91d9441d2a3655593a0aaf99f6c403d70f
> Add ifdef in irqchip struct for x86 only structures.
>
> This patch fixes a small issue where sturctures:
> 	kvm_pic_state
> 	kvm_ioapic_state
>
> are defined inside x86 specific code and may or may not
> be defined in anyway for other architectures. The problem
> caused is one cannot compile userspace apps (ex. libkvm)
> for other archs since a size cannot be determined for these
> structures.
>
>   
Applied, but changed

> +#if defined(__i386__) || defined(__x86_64__)
>   

to

    #ifdef CONFIG_X86

.

-- 
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: [PATCH] Add ifdef in irqchip struct for x86 only structures

[Jerone Young]

Hmm... so now begins the conflict with userspace and kernel space header
sharing ;-)

So the issue (which can be easily fixed) is that CONFIG_X86 is not
recognized in any userspace apps. While __i386__ & __x86_64__ are. Now
this can easily be added to our build system. But it does show the
problem.

Also there are other headers in include/linux that use the same if
defined method that I used (actually checked to see if anyone had done
it in there).

On Mon, 2007-11-26 at 17:19 +0200, Avi Kivity wrote:
> Jerone Young wrote:
> > # HG changeset patch
> > # User Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> > # Date 1196087575 21600
> > # Node ID ccf9dd8a8e0a4513090d44d52c879fb9dfbb79dd
> > # Parent  32d8bd91d9441d2a3655593a0aaf99f6c403d70f
> > Add ifdef in irqchip struct for x86 only structures.
> >
> > This patch fixes a small issue where sturctures:
> > 	kvm_pic_state
> > 	kvm_ioapic_state
> >
> > are defined inside x86 specific code and may or may not
> > be defined in anyway for other architectures. The problem
> > caused is one cannot compile userspace apps (ex. libkvm)
> > for other archs since a size cannot be determined for these
> > structures.
> >
> >   
> Applied, but changed
> 
> > +#if defined(__i386__) || defined(__x86_64__)
> >   
> 
> to
> 
>     #ifdef CONFIG_X86
> 
> .
> 


-------------------------------------------------------------------------
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: [PATCH] Add ifdef in irqchip struct for x86 only structures

[Avi Kivity]

Jerone Young wrote:
> Hmm... so now begins the conflict with userspace and kernel space header
> sharing ;-)
>
> So the issue (which can be easily fixed) is that CONFIG_X86 is not
> recognized in any userspace apps. While __i386__ & __x86_64__ are. Now
> this can easily be added to our build system. But it does show the
> problem.
>
> Also there are other headers in include/linux that use the same if
> defined method that I used (actually checked to see if anyone had done
> it in there).
>
>   

there is an unifdef-y= statement in include/linux/Kbuild that takes care 
of that.  The amended patch uses it.

> On Mon, 2007-11-26 at 17:19 +0200, Avi Kivity wrote:
>   
>> Jerone Young wrote:
>>     
>>> # HG changeset patch
>>> # User Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
>>> # Date 1196087575 21600
>>> # Node ID ccf9dd8a8e0a4513090d44d52c879fb9dfbb79dd
>>> # Parent  32d8bd91d9441d2a3655593a0aaf99f6c403d70f
>>> Add ifdef in irqchip struct for x86 only structures.
>>>
>>> This patch fixes a small issue where sturctures:
>>> 	kvm_pic_state
>>> 	kvm_ioapic_state
>>>
>>> are defined inside x86 specific code and may or may not
>>> be defined in anyway for other architectures. The problem
>>> caused is one cannot compile userspace apps (ex. libkvm)
>>> for other archs since a size cannot be determined for these
>>> structures.
>>>
>>>   
>>>       
>> Applied, but changed
>>
>>     
>>> +#if defined(__i386__) || defined(__x86_64__)
>>>   
>>>       
>> to
>>
>>     #ifdef CONFIG_X86
>>
>> .
>>
>>     
>
>   


-- 
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: [PATCH] Add ifdef in irqchip struct for x86 only structures

[Anthony Liguori]

Perhaps we could just move the declaration of kvm_irqchip to an arch 
specific header instead of introducing #ifdef's?

Does ia64 have a i8259a?

Regards,

Anthony Liguori

Jerone Young wrote:
> # HG changeset patch
> # User Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> # Date 1196087575 21600
> # Node ID ccf9dd8a8e0a4513090d44d52c879fb9dfbb79dd
> # Parent  32d8bd91d9441d2a3655593a0aaf99f6c403d70f
> Add ifdef in irqchip struct for x86 only structures.
>
> This patch fixes a small issue where sturctures:
> 	kvm_pic_state
> 	kvm_ioapic_state
>
> are defined inside x86 specific code and may or may not
> be defined in anyway for other architectures. The problem
> caused is one cannot compile userspace apps (ex. libkvm)
> for other archs since a size cannot be determined for these
> structures.
>
> Signed-off-by: Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
>
> diff --git a/include/linux/kvm.h b/include/linux/kvm.h
> --- a/include/linux/kvm.h
> +++ b/include/linux/kvm.h
> @@ -51,8 +51,10 @@ struct kvm_irqchip {
>  	__u32 pad;
>          union {
>  		char dummy[512];  /* reserving space */
> +#if defined(__i386__) || defined(__x86_64__)
>  		struct kvm_pic_state pic;
>  		struct kvm_ioapic_state ioapic;
> +#endif
>  	} chip;
>  };
>  
>
> -------------------------------------------------------------------------
> 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/
> _______________________________________________
> kvm-devel mailing list
> kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/kvm-devel
>
>   


-------------------------------------------------------------------------
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: [PATCH] Add ifdef in irqchip struct for x86 only structures

[Zhang, Xiantao]

>Perhaps we could just move the declaration of kvm_irqchip to an arch 
>specific header instead of introducing #ifdef's?

>Does ia64 have a i8259a?

Hi Anthony, 	
	IA64 doesn't need to keep i8259 for platform virtualization, but
we still need ioapic, so I  also don't think we can 
use #ifdef to solve it. 
Xiantao

Regards,

Anthony Liguori

Jerone Young wrote:
> # HG changeset patch
> # User Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> # Date 1196087575 21600
> # Node ID ccf9dd8a8e0a4513090d44d52c879fb9dfbb79dd
> # Parent  32d8bd91d9441d2a3655593a0aaf99f6c403d70f
> Add ifdef in irqchip struct for x86 only structures.
>
> This patch fixes a small issue where sturctures:
> 	kvm_pic_state
> 	kvm_ioapic_state
>
> are defined inside x86 specific code and may or may not
> be defined in anyway for other architectures. The problem
> caused is one cannot compile userspace apps (ex. libkvm)
> for other archs since a size cannot be determined for these
> structures.
>
> Signed-off-by: Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
>
> diff --git a/include/linux/kvm.h b/include/linux/kvm.h
> --- a/include/linux/kvm.h
> +++ b/include/linux/kvm.h
> @@ -51,8 +51,10 @@ struct kvm_irqchip {
>  	__u32 pad;
>          union {
>  		char dummy[512];  /* reserving space */
> +#if defined(__i386__) || defined(__x86_64__)
>  		struct kvm_pic_state pic;
>  		struct kvm_ioapic_state ioapic;
> +#endif
>  	} chip;
>  };
>  
>
>
------------------------------------------------------------------------
-
> 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/
> _______________________________________________
> kvm-devel mailing list
> kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/kvm-devel
>
>   


------------------------------------------------------------------------
-
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/
_______________________________________________
kvm-devel mailing list
kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/kvm-devel

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