[PATCH] kvm: header-sync: fix to work with 2.6.28 kernel

[PATCH] kvm: header-sync: fix to work with 2.6.28 kernel

[Mark McLoughlin]

If you run header-sync against a kernel which has asm/kvm.h but not
e.g. asm/vmx.h then $(wildcard $(headers-new)) returns a string with
expanded kvm.h path and the vmx.h glob removed. We then pass the
original globs to rsync causing that to fail when vmx.h can't be
found:

  rsync: link_stat ".../asm/vmx*.h" failed: No such file or directory (2)

Fix by passing the expanded paths returned by the wildcard function to
rsync.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 kernel/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index 33d6a84..eaf1c8e 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -71,7 +71,7 @@ header-sync:
              $T/
 	$(if $(wildcard $(headers-new)), \
 	rsync -R \
-	     $(headers-new) \
+	     $(wildcard $(headers-new)) \
              $T/include/asm-$(ARCH_DIR)/)
 
 	for i in $$(find $T -name '*.h'); do \
-- 
1.6.0.3

Re: [PATCH] kvm: header-sync: fix to work with 2.6.28 kernel

[Avi Kivity]

Mark McLoughlin wrote:
> If you run header-sync against a kernel which has asm/kvm.h but not
> e.g. asm/vmx.h then $(wildcard $(headers-new)) returns a string with
> expanded kvm.h path and the vmx.h glob removed. We then pass the
> original globs to rsync causing that to fail when vmx.h can't be
> found:
>
>   rsync: link_stat ".../asm/vmx*.h" failed: No such file or directory (2)
>
> Fix by passing the expanded paths returned by the wildcard function to
> rsync.
>   

Applied, thanks.

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