[PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[Zhang, Xiantao]

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

Hi, Avi 
	Please apply this urgent fix for 2.6.28 merge. Thanks!
Xiantao


From 532592ce64bbebb6d824fb528c281f4f3e0ee49f Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 13 Oct 2008 18:37:49 +0800
Subject: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate
asm-offsets.h

To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index bf22fb9..39e742b 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -30,7 +30,7 @@ define cmd_offsets
 	 echo "#endif" ) > $@
 endef
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c FORCE
 	$(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
@@ -49,7 +49,6 @@ common-objs = $(addprefix ../../../virt/kvm/,
kvm_main.o ioapic.o \
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o
\
 	vtlb.o process.o
-- 
1.5.1

[-- Attachment #2: 0002-kvm-ia64-Makefile-fix-for-forcing-to-re-generate-as.patch --]
[-- Type: application/octet-stream, Size: 1270 bytes --]

From 532592ce64bbebb6d824fb528c281f4f3e0ee49f Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 13 Oct 2008 18:37:49 +0800
Subject: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index bf22fb9..39e742b 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -30,7 +30,7 @@ define cmd_offsets
 	 echo "#endif" ) > $@
 endef
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c FORCE
 	$(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
@@ -49,7 +49,6 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
 	vtlb.o process.o
-- 
1.5.1

[PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[Zhang, Xiantao]

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

Hi, Avi 
	Please apply this urgent fix for 2.6.28 merge. Thanks!
Xiantao


>From 532592ce64bbebb6d824fb528c281f4f3e0ee49f Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 13 Oct 2008 18:37:49 +0800
Subject: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate
asm-offsets.h

To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index bf22fb9..39e742b 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -30,7 +30,7 @@ define cmd_offsets
 	 echo "#endif" ) > $@
 endef
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c FORCE
 	$(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
@@ -49,7 +49,6 @@ common-objs = $(addprefix ../../../virt/kvm/,
kvm_main.o ioapic.o \
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o
\
 	vtlb.o process.o
-- 
1.5.1

[-- Attachment #2: 0002-kvm-ia64-Makefile-fix-for-forcing-to-re-generate-as.patch --]
[-- Type: application/octet-stream, Size: 1270 bytes --]

From 532592ce64bbebb6d824fb528c281f4f3e0ee49f Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 13 Oct 2008 18:37:49 +0800
Subject: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index bf22fb9..39e742b 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -30,7 +30,7 @@ define cmd_offsets
 	 echo "#endif" ) > $@
 endef
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c FORCE
 	$(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
@@ -49,7 +49,6 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
 	vtlb.o process.o
-- 
1.5.1

Re: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[Avi Kivity]

Zhang, Xiantao wrote:
> Hi, Avi 
> 	Please apply this urgent fix for 2.6.28 merge. Thanks!
>   

Applied, and will queue for 2.6.28.  Is it needed for 2.6.26 and .27?  
If not, why not?

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

Re: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[Avi Kivity]

Zhang, Xiantao wrote:
> Hi, Avi 
> 	Please apply this urgent fix for 2.6.28 merge. Thanks!
>   

Applied, and will queue for 2.6.28.  Is it needed for 2.6.26 and .27?  
If not, why not?

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

RE: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[Zhang, Xiantao]

Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> Hi, Avi
>> 	Please apply this urgent fix for 2.6.28 merge. Thanks!
>> 
> 
> Applied, and will queue for 2.6.28.  Is it needed for 2.6.26 and .27?
> If not, why not?

It should be an issue here, and also needs for 2.6.26 and 27. For
end-users, it shouldn't have no problem, because they rarely to modify
vcpu's structure defition. But for developers, it may leads to weird
issues! 
Xiantao

RE: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[Zhang, Xiantao]

Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> Hi, Avi
>> 	Please apply this urgent fix for 2.6.28 merge. Thanks!
>> 
> 
> Applied, and will queue for 2.6.28.  Is it needed for 2.6.26 and .27?
> If not, why not?

It should be an issue here, and also needs for 2.6.26 and 27. For
end-users, it shouldn't have no problem, because they rarely to modify
vcpu's structure defition. But for developers, it may leads to weird
issues! 
Xiantao

Re:[PATCH] kvm/ia64: Makefile fix for forcing to re-generate

[Zhang, Xiantao]

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

Hi, Avi
        Could you revert the commit d6f9e28239fd6ac6ace6e72b44c257ed3936fdd5 ?  It should be an incorrect fix, and leads to fail to generate asm-offsets.h under some special configrations.  It should be my fault, sorry!  Please apply this one. Thanks!
Xiantao

From c680d223767159f8894e2568148c1cfe3ac5cf3c Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 23 Oct 2008 10:37:06 +0800
Subject: [PATCH]  KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h

    To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index cf37f8f..3ab4d6d 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -29,13 +29,18 @@ define cmd_offsets
         echo ""; \
         echo "#endif" ) > $@
 endef
+
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c \
+                       $(wildcard $(srctree)/arch/ia64/include/asm/*.h)\
+                       $(wildcard $(srctree)/include/linux/*.h)
        $(call if_changed_dep,cc_s_c)

 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
        $(call cmd,offsets)

+FORCE : $(obj)/$(offsets-file)
+
 #
 # Makefile for Kernel-based Virtual Machine module
 #
@@ -53,7 +58,6 @@ endif
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o

-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
        vtlb.o process.o
--
1.5.1


-----Original Message-----
From: Avi Kivity [mailto:avi@redhat.com]
Sent: Thursday, October 16, 2008 4:29 PM
To: Zhang, Xiantao
Cc: kvm-ia64@vger.kernel.org; kvm
Subject: Re: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

Zhang, Xiantao wrote:
> Hi, Avi
>       Please apply this urgent fix for 2.6.28 merge. Thanks!
>

Applied, and will queue for 2.6.28.  Is it needed for 2.6.26 and .27?
If not, why not?

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


[-- Attachment #2: 0001-KVM-ia64-Makefile-fix-for-forcing-to-re-generate.patch --]
[-- Type: application/octet-stream, Size: 1448 bytes --]

From c680d223767159f8894e2568148c1cfe3ac5cf3c Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 23 Oct 2008 10:37:06 +0800
Subject: [PATCH]  KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h

    To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index cf37f8f..3ab4d6d 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -29,13 +29,18 @@ define cmd_offsets
 	 echo ""; \
 	 echo "#endif" ) > $@
 endef
+
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c \
+			$(wildcard $(srctree)/arch/ia64/include/asm/*.h)\
+			$(wildcard $(srctree)/include/linux/*.h)
 	$(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
 	$(call cmd,offsets)
 
+FORCE : $(obj)/$(offsets-file)
+
 #
 # Makefile for Kernel-based Virtual Machine module
 #
@@ -53,7 +58,6 @@ endif
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
 	vtlb.o process.o
-- 
1.5.1

Re:[PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

[Zhang, Xiantao]

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

Hi, Avi
        Could you revert the commit d6f9e28239fd6ac6ace6e72b44c257ed3936fdd5 ?  It should be an incorrect fix, and leads to fail to generate asm-offsets.h under some special configrations.  It should be my fault, sorry!  Please apply this one. Thanks!
Xiantao

>From c680d223767159f8894e2568148c1cfe3ac5cf3c Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 23 Oct 2008 10:37:06 +0800
Subject: [PATCH]  KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h

    To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index cf37f8f..3ab4d6d 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -29,13 +29,18 @@ define cmd_offsets
         echo ""; \
         echo "#endif" ) > $@
 endef
+
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c \
+                       $(wildcard $(srctree)/arch/ia64/include/asm/*.h)\
+                       $(wildcard $(srctree)/include/linux/*.h)
        $(call if_changed_dep,cc_s_c)

 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
        $(call cmd,offsets)

+FORCE : $(obj)/$(offsets-file)
+
 #
 # Makefile for Kernel-based Virtual Machine module
 #
@@ -53,7 +58,6 @@ endif
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o

-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
        vtlb.o process.o
--
1.5.1


-----Original Message-----
From: Avi Kivity [mailto:avi@redhat.com]
Sent: Thursday, October 16, 2008 4:29 PM
To: Zhang, Xiantao
Cc: kvm-ia64@vger.kernel.org; kvm
Subject: Re: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

Zhang, Xiantao wrote:
> Hi, Avi
>       Please apply this urgent fix for 2.6.28 merge. Thanks!
>

Applied, and will queue for 2.6.28.  Is it needed for 2.6.26 and .27?
If not, why not?

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


[-- Attachment #2: 0001-KVM-ia64-Makefile-fix-for-forcing-to-re-generate.patch --]
[-- Type: application/octet-stream, Size: 1448 bytes --]

From c680d223767159f8894e2568148c1cfe3ac5cf3c Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 23 Oct 2008 10:37:06 +0800
Subject: [PATCH]  KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h

    To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index cf37f8f..3ab4d6d 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -29,13 +29,18 @@ define cmd_offsets
 	 echo ""; \
 	 echo "#endif" ) > $@
 endef
+
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c \
+			$(wildcard $(srctree)/arch/ia64/include/asm/*.h)\
+			$(wildcard $(srctree)/include/linux/*.h)
 	$(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
 	$(call cmd,offsets)
 
+FORCE : $(obj)/$(offsets-file)
+
 #
 # Makefile for Kernel-based Virtual Machine module
 #
@@ -53,7 +58,6 @@ endif
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
 	vtlb.o process.o
-- 
1.5.1