diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-09 13:34:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-09 13:34:56 +0100 |
| commit | f89600f498933655c9d11c72e2e6f210e7d8dcb4 (patch) | |
| tree | 01454df236a51fda05197e86643228f38f69786b /hw | |
| parent | a538626aff7c8934ec47bc6ed41cac5bd1b7723c (diff) | |
| parent | 92b9afe45e10edd8eaed6329366201c2165a8065 (diff) | |
| download | qemu-f89600f498933655c9d11c72e2e6f210e7d8dcb4.zip qemu-f89600f498933655c9d11c72e2e6f210e7d8dcb4.tar.gz qemu-f89600f498933655c9d11c72e2e6f210e7d8dcb4.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190709' into staging
Fixes in cpu models, tcg, and vfio-ccw.
# gpg: Signature made Tue 09 Jul 2019 13:20:52 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-20190709:
s390x/tcg: move fallthrough annotation
s390: cpumodel: fix description for the new vector facility
s390x/cpumodel: Set up CPU model for AQIC interception
vfio-ccw: Test vfio_set_irq_signaling() return value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/vfio/ccw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 6d0296f..16f200e 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -327,9 +327,8 @@ static void vfio_ccw_unregister_io_notifier(VFIOCCWDevice *vcdev) { Error *err = NULL; - vfio_set_irq_signaling(&vcdev->vdev, VFIO_CCW_IO_IRQ_INDEX, 0, - VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err); - if (err) { + if (vfio_set_irq_signaling(&vcdev->vdev, VFIO_CCW_IO_IRQ_INDEX, 0, + VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err)) { error_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name); } |