Commit f4b37171 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190403' into staging 



Fix taking address of fields in packed structs warnings
by gcc 9

# gpg: Signature made Wed 03 Apr 2019 10:58:42 BST
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20190403:
  hw/s390x/3270-ccw: avoid taking address of fields in packed struct
  hw/s390x/ipl: avoid taking address of fields in packed struct
  hw/s390/css: avoid taking address members in packed structs
  hw/vfio/ccw: avoid taking address members in packed structs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 061b51e9 7357b221

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;

    }

hw/s390x/css.c

+187 −201

File changed.

Preview size limit exceeded, changes collapsed.

hw/s390x/ipl.c

+5 −7
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) 
{

    QemuOptsList *plist = qemu_find_opts("boot-opts");

    QemuOpts *opts = QTAILQ_FIRST(&plist->head);

    uint8_t *flags = &ipl->qipl.qipl_flags;

    uint32_t *timeout = &ipl->qipl.boot_menu_timeout;

    const char *tmp;

    unsigned long splash_time = 0;
@@ -269,7 +267,7 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) 
    case S390_IPL_TYPE_CCW:

        /* In the absence of -boot menu, use zipl parameters */

        if (!qemu_opt_get(opts, "menu")) {

            *flags |= QIPL_FLAG_BM_OPTS_ZIPL;

            ipl->qipl.qipl_flags |= QIPL_FLAG_BM_OPTS_ZIPL;

            return;

        }

        break;
@@ -286,23 +284,23 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) 
        return;

    }



    *flags |= QIPL_FLAG_BM_OPTS_CMD;

    ipl->qipl.qipl_flags |= QIPL_FLAG_BM_OPTS_CMD;



    tmp = qemu_opt_get(opts, "splash-time");



    if (tmp && qemu_strtoul(tmp, NULL, 10, &splash_time)) {

        error_report("splash-time is invalid, forcing it to 0");

        *timeout = 0;

        ipl->qipl.boot_menu_timeout = 0;

        return;

    }



    if (splash_time > 0xffffffff) {

        error_report("splash-time is too large, forcing it to max value");

        *timeout = 0xffffffff;

        ipl->qipl.boot_menu_timeout = 0xffffffff;

        return;

    }



    *timeout = cpu_to_be32(splash_time);

    ipl->qipl.boot_menu_timeout = cpu_to_be32(splash_time);

}



static CcwDevice *s390_get_ccw_device(DeviceState *dev_st)

hw/vfio/ccw.c

+22 −20
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static void vfio_ccw_io_notifier_handler(void *opaque) 
    S390CCWDevice *cdev = S390_CCW_DEVICE(vcdev);

    CcwDevice *ccw_dev = CCW_DEVICE(cdev);

    SubchDev *sch = ccw_dev->sch;

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

    PMCW *p = &sch->curr_status.pmcw;

    SCHIB *schib = &sch->curr_status;

    SCSW s;

    IRB irb;

    int size;
@@ -145,33 +145,33 @@ static void vfio_ccw_io_notifier_handler(void *opaque) 
        switch (errno) {

        case ENODEV:

            /* Generate a deferred cc 3 condition. */

            s->flags |= SCSW_FLAGS_MASK_CC;

            s->ctrl &= ~SCSW_CTRL_MASK_STCTL;

            s->ctrl |= (SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND);

            schib->scsw.flags |= SCSW_FLAGS_MASK_CC;

            schib->scsw.ctrl &= ~SCSW_CTRL_MASK_STCTL;

            schib->scsw.ctrl |= (SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND);

            goto read_err;

        case EFAULT:

            /* Memory problem, generate channel data check. */

            s->ctrl &= ~SCSW_ACTL_START_PEND;

            s->cstat = SCSW_CSTAT_DATA_CHECK;

            s->ctrl &= ~SCSW_CTRL_MASK_STCTL;

            s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY |

            schib->scsw.ctrl &= ~SCSW_ACTL_START_PEND;

            schib->scsw.cstat = SCSW_CSTAT_DATA_CHECK;

            schib->scsw.ctrl &= ~SCSW_CTRL_MASK_STCTL;

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

                       SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND;

            goto read_err;

        default:

            /* Error, generate channel program check. */

            s->ctrl &= ~SCSW_ACTL_START_PEND;

            s->cstat = SCSW_CSTAT_PROG_CHECK;

            s->ctrl &= ~SCSW_CTRL_MASK_STCTL;

            s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY |

            schib->scsw.ctrl &= ~SCSW_ACTL_START_PEND;

            schib->scsw.cstat = SCSW_CSTAT_PROG_CHECK;

            schib->scsw.ctrl &= ~SCSW_CTRL_MASK_STCTL;

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

                       SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND;

            goto read_err;

        }

    } else if (size != vcdev->io_region_size) {

        /* Information transfer error, generate channel-control check. */

        s->ctrl &= ~SCSW_ACTL_START_PEND;

        s->cstat = SCSW_CSTAT_CHN_CTRL_CHK;

        s->ctrl &= ~SCSW_CTRL_MASK_STCTL;

        s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY |

        schib->scsw.ctrl &= ~SCSW_ACTL_START_PEND;

        schib->scsw.cstat = SCSW_CSTAT_CHN_CTRL_CHK;

        schib->scsw.ctrl &= ~SCSW_CTRL_MASK_STCTL;

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

                   SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND;

        goto read_err;

    }
@@ -179,11 +179,13 @@ static void vfio_ccw_io_notifier_handler(void *opaque) 
    memcpy(&irb, region->irb_area, sizeof(IRB));



    /* Update control block via irb. */

    copy_scsw_to_guest(s, &irb.scsw);

    s = schib->scsw;

    copy_scsw_to_guest(&s, &irb.scsw);

    schib->scsw = s;



    /* If a uint check is pending, copy sense data. */

    if ((s->dstat & SCSW_DSTAT_UNIT_CHECK) &&

        (p->chars & PMCW_CHARS_MASK_CSENSE)) {

    if ((schib->scsw.dstat & SCSW_DSTAT_UNIT_CHECK) &&

        (schib->pmcw.chars & PMCW_CHARS_MASK_CSENSE)) {

        memcpy(sch->sense_data, irb.ecw, sizeof(irb.ecw));

    }