SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vfio/ccw: Use the 'Error **errp' argument of vfio_ccw_realize()

Browse Source 
The local error variable is kept for vfio_ccw_register_irq_notifier()
because it is not considered as a failing condition. We will change
how error reporting is done in following changes.

Remove the error_propagate() call.

Cc: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Anthony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240522170107.289532-6-clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Cédric Le Goater 2024-05-22 19:01:05 +02:00 committed by Thomas Huth
parent 45f4218784
commit 1aeebbd621
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/vfio/ccw.c
View File

@ -582,8 +582,8 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
/* Call the class init function for subchannel. */ /* Call the class init function for subchannel. */
if (cdc->realize) { if (cdc->realize) {
if (!cdc->realize(cdev, vcdev->vdev.sysfsdev, &err)) { if (!cdc->realize(cdev, vcdev->vdev.sysfsdev, errp)) {
goto out_err_propagate; return;
} }
} }
@ -596,17 +596,17 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
goto out_attach_dev_err; goto out_attach_dev_err;
} }
if (!vfio_ccw_get_region(vcdev, &err)) { if (!vfio_ccw_get_region(vcdev, errp)) {
goto out_region_err; goto out_region_err;
} }
if (!vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX, &err)) { if (!vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX, errp)) {
goto out_io_notifier_err; goto out_io_notifier_err;
} }
if (vcdev->crw_region) { if (vcdev->crw_region) {
if (!vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX, if (!vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX,
&err)) { errp)) {
goto out_irq_notifier_err; goto out_irq_notifier_err;
} }
} }
@ -634,8 +634,6 @@ out_attach_dev_err:
if (cdc->unrealize) { if (cdc->unrealize) {
cdc->unrealize(cdev); cdc->unrealize(cdev);
} }
out_err_propagate:
error_propagate(errp, err);
} }
static void vfio_ccw_unrealize(DeviceState *dev) static void vfio_ccw_unrealize(DeviceState *dev)