mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio/ap: Make vfio_ap_register_irq_notifier() return a bool

Browse Source 
Since vfio_ap_register_irq_notifier() takes and 'Error **' argument,
best practices suggest to return a bool. See the qapi/error.h Rules
section.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Cédric Le Goater 2024-04-25 11:02:12 +02:00
parent ae7aca14bd
commit cbd470f0aa
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/vfio/ap.c
View File

@ -70,7 +70,7 @@ static void vfio_ap_req_notifier_handler(void *opaque)
} }
} }
static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
unsigned int irq, Error **errp) unsigned int irq, Error **errp)
{ {
int fd; int fd;
@ -87,13 +87,13 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
break; break;
default: default:
error_setg(errp, "vfio: Unsupported device irq(%d)", irq); error_setg(errp, "vfio: Unsupported device irq(%d)", irq);
return; return false;
} }
if (vdev->num_irqs < irq + 1) { if (vdev->num_irqs < irq + 1) {
error_setg(errp, "vfio: IRQ %u not available (number of irqs %u)", error_setg(errp, "vfio: IRQ %u not available (number of irqs %u)",
irq, vdev->num_irqs); irq, vdev->num_irqs);
return; return false;
} }
argsz = sizeof(*irq_info); argsz = sizeof(*irq_info);
@ -104,14 +104,14 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO,
irq_info) < 0 || irq_info->count < 1) { irq_info) < 0 || irq_info->count < 1) {
error_setg_errno(errp, errno, "vfio: Error getting irq info"); error_setg_errno(errp, errno, "vfio: Error getting irq info");
return; return false;
} }
if (event_notifier_init(notifier, 0)) { if (event_notifier_init(notifier, 0)) {
error_setg_errno(errp, errno, error_setg_errno(errp, errno,
"vfio: Unable to init event notifier for irq (%d)", "vfio: Unable to init event notifier for irq (%d)",
irq); irq);
return; return false;
} }
fd = event_notifier_get_fd(notifier); fd = event_notifier_get_fd(notifier);
@ -122,6 +122,8 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
qemu_set_fd_handler(fd, NULL, NULL, vapdev); qemu_set_fd_handler(fd, NULL, NULL, vapdev);
event_notifier_cleanup(notifier); event_notifier_cleanup(notifier);
} }
return true;
} }
static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev, static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
@ -167,8 +169,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
goto error; goto error;
} }
vfio_ap_register_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX, &err); if (!vfio_ap_register_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX, &err)) {
if (err) {
/* /*
* Report this error, but do not make it a failing condition. * Report this error, but do not make it a failing condition.
* Lack of this IRQ in the host does not prevent normal operation. * Lack of this IRQ in the host does not prevent normal operation.