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

[Paolo Bonzini <pbonzini@redhat.com>]

Il 10/10/2014 11:11, Cornelia Huck ha scritto:
> On Fri, 10 Oct 2014 10:47:09 +0200
> Cornelia Huck <cornelia.huck@de.ibm.com> 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
> 
> Seems to be compiler version dependant. With the SLES11SP3 compiler
> (calls itself 4.3.4), I get the failure above. With newer compilers
> (4.6+), it builds fine.

Can you check that this fixes it?

diff --git a/kvm-all.c b/kvm-all.c
index e98a7c7..44a5e72 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -71,7 +71,7 @@ typedef struct KVMSlot
 
 typedef struct kvm_dirty_log KVMDirtyLog;
 
-typedef struct KVMState
+struct KVMState
 {
     AccelState parent_obj;
 
@@ -107,7 +107,7 @@ typedef struct KVMState
     QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE];
     bool direct_msi;
 #endif
-} KVMState;
+};
 
 #define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm")
 
Paolo