motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-28 12:32:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vfio/pci: Make vfio_intx_enable_kvm() return a bool

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

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Zhenzhong Duan 2024-05-22 12:40:03 +08:00 • committed by Cédric Le Goater
parent 040f8d1050
commit 44cd660a99
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hw/vfio/pci.c
View file

@ -116,7 +116,7 @@ static void vfio_intx_eoi(VFIODevice *vbasedev)
vfio_unmask_single_irqindex(vbasedev, VFIO_PCI_INTX_IRQ_INDEX); vfio_unmask_single_irqindex(vbasedev, VFIO_PCI_INTX_IRQ_INDEX);
} }
static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp)
{ {
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
int irq_fd = event_notifier_get_fd(&vdev->intx.interrupt); int irq_fd = event_notifier_get_fd(&vdev->intx.interrupt);
@ -124,7 +124,7 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp)
if (vdev->no_kvm_intx || !kvm_irqfds_enabled() || if (vdev->no_kvm_intx || !kvm_irqfds_enabled() ||
vdev->intx.route.mode != PCI_INTX_ENABLED || vdev->intx.route.mode != PCI_INTX_ENABLED ||
!kvm_resamplefds_enabled()) { !kvm_resamplefds_enabled()) {
return; return true;
} }
/* Get to a known interrupt state */ /* Get to a known interrupt state */
@ -161,7 +161,7 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp)
trace_vfio_intx_enable_kvm(vdev->vbasedev.name); trace_vfio_intx_enable_kvm(vdev->vbasedev.name);
return; return true;
fail_vfio: fail_vfio:
kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &vdev->intx.interrupt, kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &vdev->intx.interrupt,
@ -171,6 +171,9 @@ fail_irqfd:
fail: fail:
qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev); qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev);
vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);
return false;
#else
return true;
#endif #endif
} }
@ -226,8 +229,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route)
return; return;
} }
vfio_intx_enable_kvm(vdev, &err); if (!vfio_intx_enable_kvm(vdev, &err)) {
if (err) {
warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
} }
@ -302,8 +304,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
return -errno; return -errno;
} }
vfio_intx_enable_kvm(vdev, &err); if (!vfio_intx_enable_kvm(vdev, &err)) {
if (err) {
warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
} }