Re: kvm-userspace build break (linux/types.h)

2009-02-23 Thread Avi Kivity

Hollis Blanchard wrote:

On Fri, 2009-02-20 at 09:44 -0600, Hollis Blanchard wrote:
  

Avi, would you pull kvm-userspace
05acb1ae99a8b55c9745f2e566010213cf52a819 into maint/2.6.29 branch
please?



Also needed in maint/2.6.29:

commit 3f7cba35281a5b2dba008179a4979d737105574d
Author: Avi Kivity a...@redhat.com
Date:   Thu Jan 22 15:16:18 2009 +0200

kvm: external module: compatibility for hrtimer_expires_remaining()

Signed-off-by: Avi Kivity a...@redhat.com


commit 034e9938f4336f69d643a23ae4b18fa0e6524c9b
Author: Avi Kivity a...@redhat.com
Date:   Wed Feb 4 19:21:07 2009 +0200

kvm: external module: hrtimer_expires_remaining was introduced in 2.6.28

Noted by Alexander Graf.

Signed-off-by: Avi Kivity a...@redhat.com


  


Picked all three, thanks.

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

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: kvm-userspace build break (linux/types.h)

2009-02-20 Thread Hollis Blanchard
On Fri, 2009-02-20 at 10:42 +0530, Jaswinder Singh Rajput wrote:
 On Thu, 2009-02-19 at 15:50 -0600, Hollis Blanchard wrote:
  A recent kernel merge breaks kvm-userspace build:
  make[1]: Entering directory `/root/hollisb/kvm-userspace.git/libkvm'
  gcc -m64 -D__x86_64__ -MMD -MF ./.libkvm.d -g -fomit-frame-pointer 
  -Wall  -fno-stack-protector   -I 
  /root/hollisb/kvm-userspace.git/kernel/include   -c -o libkvm.o libkvm.c
  In file included from /usr/include/bits/fcntl.h:24,
   from /usr/include/fcntl.h:34,
   from libkvm.c:30:
  /usr/include/sys/types.h:46: error: conflicting types for ‘loff_t’
  /usr/include/linux/types.h:30: error: previous declaration of 
  ‘loff_t’ was here
  /usr/include/sys/types.h:62: error: conflicting types for ‘dev_t’
  /usr/include/linux/types.h:13: error: previous declaration of 
  ‘dev_t’ was here
  [...]
  
  I built like so:
  ./configure
  make -C kernel LINUX=/path/to/kvm.git sync
  make
  
  The problem appears to be 00bfddaf7f68a6551319b536f052040c370756b0 and
  cef3767852a9b1a7ff4a8dfe0969e2d32eb728df, both from Jaswinder Singh
  Rajput jaswin...@infradead.org: 
  -#include asm/types.h
  +#include linux/types.h
  
  With these changes, libkvm.c ends up
  including /usr/include/linux/types.h, instead of the
  intended ../kernel/include/linux/types.h.
  
  Avi, suggestions? More make sync hacks?
  
 
 Avi, Is this already fixed, Or it is in your Magic Box (patch queue ;-)

Sorry, my fault... it is already fixed in the master branch of Avi's
tree.

 Hollis: Do you mind testing -tip tree, may be we already fixed your
 problem, Ingo is having big Magic Box :)
 http://git.kernel.org/?p=linux/kernel/git/x86/linux-2.6-tip.git;a=summary

Avi, would you pull kvm-userspace
05acb1ae99a8b55c9745f2e566010213cf52a819 into maint/2.6.29 branch
please?

-- 
Hollis Blanchard
IBM Linux Technology Center

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: kvm-userspace build break (linux/types.h)

2009-02-20 Thread Hollis Blanchard
On Fri, 2009-02-20 at 09:44 -0600, Hollis Blanchard wrote:
 
 Avi, would you pull kvm-userspace
 05acb1ae99a8b55c9745f2e566010213cf52a819 into maint/2.6.29 branch
 please?

Also needed in maint/2.6.29:

commit 3f7cba35281a5b2dba008179a4979d737105574d
Author: Avi Kivity a...@redhat.com
Date:   Thu Jan 22 15:16:18 2009 +0200

kvm: external module: compatibility for hrtimer_expires_remaining()

Signed-off-by: Avi Kivity a...@redhat.com

commit 034e9938f4336f69d643a23ae4b18fa0e6524c9b
Author: Avi Kivity a...@redhat.com
Date:   Wed Feb 4 19:21:07 2009 +0200

kvm: external module: hrtimer_expires_remaining was introduced in 2.6.28

Noted by Alexander Graf.

Signed-off-by: Avi Kivity a...@redhat.com


-- 
Hollis Blanchard
IBM Linux Technology Center

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: kvm-userspace build break (linux/types.h)

2009-02-19 Thread Joerg Roedel
On Thu, Feb 19, 2009 at 03:50:14PM -0600, Hollis Blanchard wrote:
 A recent kernel merge breaks kvm-userspace build:
 make[1]: Entering directory `/root/hollisb/kvm-userspace.git/libkvm'
 gcc -m64 -D__x86_64__ -MMD -MF ./.libkvm.d -g -fomit-frame-pointer 
 -Wall  -fno-stack-protector   -I 
 /root/hollisb/kvm-userspace.git/kernel/include   -c -o libkvm.o libkvm.c
 In file included from /usr/include/bits/fcntl.h:24,
  from /usr/include/fcntl.h:34,
  from libkvm.c:30:
 /usr/include/sys/types.h:46: error: conflicting types for ‘loff_t’
 /usr/include/linux/types.h:30: error: previous declaration of 
 ‘loff_t’ was here
 /usr/include/sys/types.h:62: error: conflicting types for ‘dev_t’
 /usr/include/linux/types.h:13: error: previous declaration of ‘dev_t’ 
 was here
 [...]
 
 I built like so:
 ./configure
 make -C kernel LINUX=/path/to/kvm.git sync
 make
 
 The problem appears to be 00bfddaf7f68a6551319b536f052040c370756b0 and
 cef3767852a9b1a7ff4a8dfe0969e2d32eb728df, both from Jaswinder Singh
 Rajput jaswin...@infradead.org: 
 -#include asm/types.h
 +#include linux/types.h
 
 With these changes, libkvm.c ends up
 including /usr/include/linux/types.h, instead of the
 intended ../kernel/include/linux/types.h.

I had the same problem some weeks ago. IIRC I fixed it with some include
reordering in libkvm.h.

Joerg
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: kvm-userspace build break (linux/types.h)

2009-02-19 Thread Zhang, Xiantao
For x86 and ia64,  linux/types.h will be hacked to asm/types.h when syncing the 
source. 
You may consult kernel/x86/hack-module.awk to get the answer.  
Xiantao

Joerg Roedel wrote:
 On Thu, Feb 19, 2009 at 03:50:14PM -0600, Hollis Blanchard wrote:
 A recent kernel merge breaks kvm-userspace build:
 make[1]: Entering directory
 `/root/hollisb/kvm-userspace.git/libkvm' gcc -m64
 -D__x86_64__ -MMD -MF ./.libkvm.d -g -fomit-frame-pointer
  -Wall  -fno-stack-protector   -I
 
 /root/hollisb/kvm-userspace.git/kernel/include   -c -o
 libkvm.o libkvm.c In file included from
 /usr/include/bits/fcntl.h:24, from /usr/include/fcntl.h:34,
 from libkvm.c:30: /usr/include/sys/types.h:46: error:
 conflicting types for 'loff_t' /usr/include/linux/types.h:30: error:
 previous declaration of 'loff_t' was here
 /usr/include/sys/types.h:62: error: conflicting types for 'dev_t'
 /usr/include/linux/types.h:13: error: previous declaration of
 'dev_t' was here [...] 
 
 I built like so:
 ./configure
 make -C kernel LINUX=/path/to/kvm.git sync
 make
 
 The problem appears to be 00bfddaf7f68a6551319b536f052040c370756b0
 and 
 cef3767852a9b1a7ff4a8dfe0969e2d32eb728df, both from Jaswinder Singh
 Rajput jaswin...@infradead.org:
 -#include asm/types.h
 +#include linux/types.h
 
 With these changes, libkvm.c ends up
 including /usr/include/linux/types.h, instead of the
 intended ../kernel/include/linux/types.h.
 
 I had the same problem some weeks ago. IIRC I fixed it with some
 include reordering in libkvm.h.
 
 Joerg

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html