Re: [Qemu-devel] [PATCH CFT v3 00/50] NEED_CPU_H / cpu.h / hw/hw.h cleanups

[Cornelia Huck]

On Wed, 18 May 2016 10:21:47 +0200
Cornelia Huck <address@hidden> wrote:

> On Mon, 16 May 2016 17:35:32 +0200
> Paolo Bonzini <address@hidden> wrote:
> 
> > I compiled this on x64 Linux (all patches) and 32-bit ARM
> > Linux, and I will compile it on Win32 before sending a pull
> > request.  I would appreciate people compile-testing it on s390
> > and PPC.  The changes are available in the git repository at
> > git://github.com/bonzini/qemu.git, branch need-cpu-h (SHA1 for the top
> > commit is b65f2d57b126883367fb81d54f383352b24029b1).
> 
> Hmm...
> 
> In file included from /root/git/qemu/include/sysemu/kvm.h:221:0,
>                  from /root/git/qemu/balloon.c:30:
> /root/git/qemu/target-s390x/cpu.h: In function ‘vregs_needed’:
> /root/git/qemu/target-s390x/cpu.h:1241:9: error: implicit declaration of 
> function ‘kvm_check_extension’ [-Werror=implicit-function-declaration]
>          return kvm_check_extension(kvm_state, KVM_CAP_S390_VECTOR_REGISTERS);
>          ^
> /root/git/qemu/target-s390x/cpu.h:1241:9: error: nested extern declaration of 
> ‘kvm_check_extension’ [-Werror=nested-externs]
> In file included from /root/git/qemu/balloon.c:30:0:
> /root/git/qemu/include/sysemu/kvm.h: At top level:
> /root/git/qemu/include/sysemu/kvm.h:401:5: error: redundant redeclaration of 
> ‘kvm_check_extension’ [-Werror=redundant-decls]
>  int kvm_check_extension(KVMState *s, unsigned int extension);
>      ^
> In file included from /root/git/qemu/include/sysemu/kvm.h:221:0,
>                  from /root/git/qemu/balloon.c:30:
> /root/git/qemu/target-s390x/cpu.h:1241:16: note: previous implicit 
> declaration of ‘kvm_check_extension’ was here
>          return kvm_check_extension(kvm_state, KVM_CAP_S390_VECTOR_REGISTERS);
>                 ^
> 
> That's on one of my s390x systems; on another one (where I don't test),
> it builds. But something's wrong :)

Ah, that's because the functioning one used --disable-kvm.

Should the call to kvm_check_extension() be moved to target-s390x/kvm.c?