Commit 7357b221 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Cornelia Huck
Browse files

hw/s390x/3270-ccw: avoid taking address of fields in packed struct 



Compiling with GCC 9 complains

hw/s390x/3270-ccw.c: In function ‘emulated_ccw_3270_cb’:
hw/s390x/3270-ccw.c:81:19: error: taking address of packed member of ‘struct SCHIB’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
   81 |         SCSW *s = &sch->curr_status.scsw;
      |                   ^~~~~~~~~~~~~~~~~~~~~~

This local variable is only present to save a little bit of
typing when setting the field later. Get rid of this to avoid
the warning about unaligned accesses.

Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190329111104.17223-15-berrange@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 5d45a332

hw/s390x/3270-ccw.c

+4 −4
Original line number Diff line number Diff line
@@ -78,13 +78,13 @@ static int emulated_ccw_3270_cb(SubchDev *sch, CCW1 ccw) 


    if (rc == -EIO) {

        /* I/O error, specific devices generate specific conditions */

        SCSW *s = &sch->curr_status.scsw;

        SCHIB *schib = &sch->curr_status;



        sch->curr_status.scsw.dstat = SCSW_DSTAT_UNIT_CHECK;

        sch->sense_data[0] = 0x40;    /* intervention-req */

        s->ctrl &= ~SCSW_ACTL_START_PEND;

        s->ctrl &= ~SCSW_CTRL_MASK_STCTL;

        s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY |

        schib->scsw.ctrl &= ~SCSW_ACTL_START_PEND;

        schib->scsw.ctrl &= ~SCSW_CTRL_MASK_STCTL;

        schib->scsw.ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY |

                   SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND;

    }