[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] vfio-ccw: Attempt to clean up all IRQs on error
From: |
Cornelia Huck |
Subject: |
[PULL 7/7] vfio-ccw: Attempt to clean up all IRQs on error |
Date: |
Thu, 6 May 2021 17:44:23 +0200 |
From: Eric Farman <farman@linux.ibm.com>
The vfio_ccw_unrealize() routine makes an unconditional attempt to
unregister every IRQ notifier, though they may not have been registered
in the first place (when running on an older kernel, for example).
Let's mirror this behavior in the error cleanups in vfio_ccw_realize()
so that if/when new IRQs are added, it is less confusing to recognize
the necessary procedures. The worst case scenario would be some extra
messages about an undefined IRQ, but since this is an error exit that
won't be the only thing to worry about.
And regarding those messages, let's change it to a warning instead of
an error, to better reflect their severity. The existing code in both
paths handles everything anyway.
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Acked-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-Id: <20210428143652.1571487-1-farman@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/vfio/ccw.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index 7c058d13e8ce..139a3d9d1b95 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -469,7 +469,7 @@ static void vfio_ccw_unregister_irq_notifier(VFIOCCWDevice
*vcdev,
if (vfio_set_irq_signaling(&vcdev->vdev, irq, 0,
VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err)) {
- error_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name);
+ warn_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name);
}
qemu_set_fd_handler(event_notifier_get_fd(notifier),
@@ -689,7 +689,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
if (vcdev->crw_region) {
vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX, &err);
if (err) {
- goto out_crw_notifier_err;
+ goto out_irq_notifier_err;
}
}
@@ -704,7 +704,9 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
return;
-out_crw_notifier_err:
+out_irq_notifier_err:
+ vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_REQ_IRQ_INDEX);
+ vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX);
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX);
out_io_notifier_err:
vfio_ccw_put_region(vcdev);
--
2.30.2
- [PULL 0/7] s390x update, Cornelia Huck, 2021/05/06
- [PULL 1/7] target/s390x: Fix translation exception on illegal instruction, Cornelia Huck, 2021/05/06
- [PULL 3/7] target/xtensa: Make sure that tb->size != 0, Cornelia Huck, 2021/05/06
- [PULL 2/7] target/arm: Make sure that commpage's tb->size != 0, Cornelia Huck, 2021/05/06
- [PULL 4/7] accel/tcg: Assert that tb->size != 0 after translation, Cornelia Huck, 2021/05/06
- [PULL 6/7] hw/s390x/ccw: Register qbus type in abstract TYPE_CCW_DEVICE parent, Cornelia Huck, 2021/05/06
- [PULL 5/7] vfio-ccw: Permit missing IRQs, Cornelia Huck, 2021/05/06
- [PULL 7/7] vfio-ccw: Attempt to clean up all IRQs on error,
Cornelia Huck <=
- Re: [PULL 0/7] s390x update, Peter Maydell, 2021/05/11