On 25/08/2020 21.20, Eduardo Habkost wrote: > Move typedef closer to the type check macros, to make it easier > to convert the code to OBJECT_DEFINE_TYPE() in the future. > > Acked-by: Cornelia Huck <coh...@redhat.com> > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > --- > Changes v2 -> v3: none > > Changes v1 -> v2: none > > --- > Cc: Cornelia Huck <coh...@redhat.com> > Cc: Thomas Huth <th...@redhat.com> > Cc: Halil Pasic <pa...@linux.ibm.com> > Cc: Christian Borntraeger <borntrae...@de.ibm.com> > Cc: qemu-s3...@nongnu.org > Cc: qemu-devel@nongnu.org > --- > include/hw/s390x/s390_flic.h | 1 + > hw/intc/s390_flic_kvm.c | 4 ++-- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h > index 4687ecfe83..df11de9b20 100644 > --- a/include/hw/s390x/s390_flic.h > +++ b/include/hw/s390x/s390_flic.h > @@ -75,6 +75,7 @@ typedef struct S390FLICStateClass { > } S390FLICStateClass; > > #define TYPE_KVM_S390_FLIC "s390-flic-kvm" > +typedef struct KVMS390FLICState KVMS390FLICState; > #define KVM_S390_FLIC(obj) \ > OBJECT_CHECK(KVMS390FLICState, (obj), TYPE_KVM_S390_FLIC) > > diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c > index a306b26faa..dbd4e682ce 100644 > --- a/hw/intc/s390_flic_kvm.c > +++ b/hw/intc/s390_flic_kvm.c > @@ -29,12 +29,12 @@ > #define FLIC_FAILED (-1UL) > #define FLIC_SAVEVM_VERSION 1 > > -typedef struct KVMS390FLICState { > +struct KVMS390FLICState{ > S390FLICState parent_obj; > > uint32_t fd; > bool clear_io_supported; > -} KVMS390FLICState; > +}; > > static KVMS390FLICState *s390_get_kvm_flic(S390FLICState *fs) > { >
Reviewed-by: Thomas Huth <th...@redhat.com>