Re: [Qemu-devel] [PULL 23/28] kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct

[Gonglei <arei.gonglei@huawei.com>]

On 2014/10/10 16:47, Cornelia Huck wrote:

> On Thu,  9 Oct 2014 12:17:30 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
> 
>> From: Eduardo Habkost <ehabkost@redhat.com>
>>
>> Now that we create an accel object before calling machine_init, we can
>> simply use the accel object to save all KVMState data, instead of
>> allocationg KVMState manually.
>>
>> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>  kvm-all.c | 13 +++++++++----
>>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> This patch breaks compilation on s390 for me:
> 
>   CC    s390x-softmmu/kvm-all.o
> /home/cohuck/git/qemu/kvm-all.c:110: error: redefinition of typedef ‘KVMState’
> /home/cohuck/git/qemu/include/sysemu/kvm.h:161: error: previous declaration of ‘KVMState’ was here
> 
> 

I encountered this issue too [gcc version 4.3.4 [gcc-4_3-branch revision 152973] (SUSE Linux) ]:

  CC    m68k-softmmu/cputlb.o
  CC    mips64-softmmu/memory.o
/home/qemu/kvm-all.c:110: error: redefinition of typedef 'KVMState'
/home/qemu/include/sysemu/kvm.h:161: error: previous declaration of 'KVMState' was here
  CC    arm-softmmu/memory.o
make[1]: *** [kvm-all.o] Error 1
make: *** [subdir-i386-softmmu] Error 2
make: *** Waiting for unfinished jobs....
  CC    mips64-softmmu/savevm.o
  CC    or32-softmmu/cputlb.o
  CC    microblaze-softmmu/cputlb.o
  CC    xtensaeb-softmmu/cputlb.o
  CC    mips64el-softmmu/savevm.o
  CC    ppcemb-softmmu/ioport.o
  CC    sh4-softmmu/savevm.o
  CC    ppc-softmmu/ioport.o
  CC    aarch64-softmmu/device_tree.o
  CC    mips-softmmu/savevm.o
  CC    cris-softmmu/cputlb.o
  CC    microblazeel-softmmu/cputlb.o
  CC    sparc-softmmu/cputlb.o
  CC    sh4eb-softmmu/cputlb.o
/home/qemu/kvm-all.c:110: error: redefinition of typedef 'KVMState'
/home/qemu/include/sysemu/kvm.h:161: error: previous declaration of 'KVMState' was here

Best regards,
-Gonglei