[PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

[PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 907 bytes --]

>From 138335ed8c52e775a267a91086e580f86dd5b047 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 13 Nov 2008 15:23:31 +0800
Subject: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

In some OS distros, there is no compiler.h installed for building
applications, and leads to break userspace build.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 kernel/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index aca365e..ed4e2fd 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -64,6 +64,7 @@ header-sync:
 	rm -rf $T
 	rsync -R \
 	     "$(LINUX)"/./include/linux/kvm*.h \
+	     "$(LINUX)"/./include/linux/compiler.h \
 	     $(if $(wildcard $(headers-old)), $(headers-old)) \
              $T/
 	$(if $(wildcard $(headers-new)), \
-- 
1.6.0

[-- Attachment #2: 0001-KVM-Qemu-Sync-compiler.h-from-kernel-source-when-d.patch --]
[-- Type: application/octet-stream, Size: 881 bytes --]

From 138335ed8c52e775a267a91086e580f86dd5b047 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 13 Nov 2008 15:23:31 +0800
Subject: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

In some OS distros, there is no compiler.h installed for building
applications, and leads to break userspace build.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 kernel/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index aca365e..ed4e2fd 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -64,6 +64,7 @@ header-sync:
 	rm -rf $T
 	rsync -R \
 	     "$(LINUX)"/./include/linux/kvm*.h \
+	     "$(LINUX)"/./include/linux/compiler.h \
 	     $(if $(wildcard $(headers-old)), $(headers-old)) \
              $T/
 	$(if $(wildcard $(headers-new)), \
-- 
1.6.0

Re: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

[Avi Kivity]

Zhang, Xiantao wrote:
> From 138335ed8c52e775a267a91086e580f86dd5b047 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Thu, 13 Nov 2008 15:23:31 +0800
> Subject: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.
>
> In some OS distros, there is no compiler.h installed for building
> applications, and leads to break userspace build.
> Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
> ---
>  kernel/Makefile |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/kernel/Makefile b/kernel/Makefile
> index aca365e..ed4e2fd 100644
> --- a/kernel/Makefile
> +++ b/kernel/Makefile
> @@ -64,6 +64,7 @@ header-sync:
>  	rm -rf $T
>  	rsync -R \
>  	     "$(LINUX)"/./include/linux/kvm*.h \
> +	     "$(LINUX)"/./include/linux/compiler.h \
>  	     $(if $(wildcard $(headers-old)), $(headers-old)) \
>               $T/
>  	$(if $(wildcard $(headers-new)), \
>   

Maybe we should just remove the compiler.h include in hack-modules.awk?

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

RE: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

[Zhang, Xiantao]

Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> From 138335ed8c52e775a267a91086e580f86dd5b047 Mon Sep 17 00:00:00
>> 2001 
>> From: Xiantao Zhang <xiantao.zhang@intel.com>
>> Date: Thu, 13 Nov 2008 15:23:31 +0800
>> Subject: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when
>> do make sync. 
>> 
>> In some OS distros, there is no compiler.h installed for building
>> applications, and leads to break userspace build.
>> Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com> ---
>>  kernel/Makefile |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>> 
>> diff --git a/kernel/Makefile b/kernel/Makefile
>> index aca365e..ed4e2fd 100644
>> --- a/kernel/Makefile
>> +++ b/kernel/Makefile
>> @@ -64,6 +64,7 @@ header-sync:
>>  	rm -rf $T
>>  	rsync -R \
>>  	     "$(LINUX)"/./include/linux/kvm*.h \
>> +	     "$(LINUX)"/./include/linux/compiler.h \
>>  	     $(if $(wildcard $(headers-old)), $(headers-old)) \           
>>  	$T/ $(if $(wildcard $(headers-new)), \
>> 
> 
> Maybe we should just remove the compiler.h include in
> hack-modules.awk? 

I am not sure the inclusion for comiplier.h in <linux/kvm.h> is unnecessry when building userspace or external module.  If it is useless, maybe we can remove it in hach. Could you confirm it ?
Xiantao

Re: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

[Avi Kivity]

Zhang, Xiantao wrote:
> I am not sure the inclusion for comiplier.h in <linux/kvm.h> is unnecessry when building userspace or external module.  If it is useless, maybe we can remove it in hach. Could you confirm it ?
>   

I think that the kernel's 'make headers-install' process strips out 
compiler.h, so it should be safe.

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

RE: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]

Attached. Thanks!

>From 0175b35b388b3d1a8df82bdab200a8d8d00bab3d Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 17 Nov 2008 09:58:53 +0800
Subject: [PATCH] KVM: External Module: Remove the inclusion for <linux/compiler.h>

Some OSes lack of <linux/compiler.h> for applications,
so removes it from kernel header files.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 kernel/ia64/hack-module.awk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index e60e194..38db00f 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -12,4 +12,6 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
     }
 }
 
+/#include <linux\/compiler.h>/ { $0 = "" }
+
 { print }
-- 
1.6.0


-----Original Message-----
From: Avi Kivity [mailto:avi@redhat.com] 
Sent: Sunday, November 16, 2008 4:23 PM
To: Zhang, Xiantao
Cc: kvm@vger.kernel.org; kvm-ia64@vger.kernel.org
Subject: Re: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

Zhang, Xiantao wrote:
> I am not sure the inclusion for comiplier.h in <linux/kvm.h> is unnecessry when building userspace or external module.  If it is useless, maybe we can remove it in hach. Could you confirm it ?
>   

I think that the kernel's 'make headers-install' process strips out 
compiler.h, so it should be safe.

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


[-- Attachment #2: 0001-KVM-External-Module-Remove-the-inclusion-for-linu.patch --]
[-- Type: application/octet-stream, Size: 809 bytes --]

From 0175b35b388b3d1a8df82bdab200a8d8d00bab3d Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 17 Nov 2008 09:58:53 +0800
Subject: [PATCH] KVM: External Module: Remove the inclusion for <linux/compiler.h>

Some OSes lack of <linux/compiler.h> for applications,
so removes it from kernel header files.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 kernel/ia64/hack-module.awk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index e60e194..38db00f 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -12,4 +12,6 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
     }
 }
 
+/#include <linux\/compiler.h>/ { $0 = "" }
+
 { print }
-- 
1.6.0

Re: [PATCH] KVM: Qemu: Sync compiler.h from kernel source when do make sync.

[Avi Kivity]

Zhang, Xiantao wrote:
> Attached. Thanks!
>
> From 0175b35b388b3d1a8df82bdab200a8d8d00bab3d Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Mon, 17 Nov 2008 09:58:53 +0800
> Subject: [PATCH] KVM: External Module: Remove the inclusion for <linux/compiler.h>
>
> Some OSes lack of <linux/compiler.h> for applications,
> so removes it from kernel header files.
>   

Applied, thanks.

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