On 25/08/2020 21.20, Eduardo Habkost wrote:
> This will make future conversion to OBJECT_DECLARE* easier.
>
> In sclp.h, use "struct SCLPEventFacility" to avoid introducing
> unnecessary header dependencies.
>
> Acked-by: Cornelia Huck <cohuck@redhat.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v2 -> v3: none
>
> Changes series v1 -> v2: new patch in series v2
>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
> include/hw/s390x/event-facility.h | 1 +
> include/hw/s390x/sclp.h | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h
> index 700a610f33..e61c4651d7 100644
> --- a/include/hw/s390x/event-facility.h
> +++ b/include/hw/s390x/event-facility.h
> @@ -195,6 +195,7 @@ typedef struct SCLPEventClass {
> } SCLPEventClass;
>
> #define TYPE_SCLP_EVENT_FACILITY "s390-sclp-event-facility"
> +typedef struct SCLPEventFacility SCLPEventFacility;
> #define EVENT_FACILITY(obj) \
> OBJECT_CHECK(SCLPEventFacility, (obj), TYPE_SCLP_EVENT_FACILITY)
> #define EVENT_FACILITY_CLASS(klass) \
> diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
> index 822eff4396..a87ed2a0ab 100644
> --- a/include/hw/s390x/sclp.h
> +++ b/include/hw/s390x/sclp.h
> @@ -185,12 +185,12 @@ typedef struct SCCB {
> #define SCLP_CLASS(oc) OBJECT_CLASS_CHECK(SCLPDeviceClass, (oc), TYPE_SCLP)
> #define SCLP_GET_CLASS(obj) OBJECT_GET_CLASS(SCLPDeviceClass, (obj), TYPE_SCLP)
>
> -typedef struct SCLPEventFacility SCLPEventFacility;
> +struct SCLPEventFacility;
>
> typedef struct SCLPDevice {
> /* private */
> DeviceState parent_obj;
> - SCLPEventFacility *event_facility;
> + struct SCLPEventFacility *event_facility;
> int increment_size;
>
> /* public */
>
Reviewed-by: Thomas Huth <thuth@redhat.com>