Re: [PATCH 08/16] vfio/pci: Make vfio_intx_enable_kvm() return a bool

[Cédric Le Goater]

On 5/15/24 10:20, Zhenzhong Duan wrote:

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.d...@intel.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  hw/vfio/pci.c | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index aad012c348..12fb534d79 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -116,7 +116,7 @@ static void vfio_intx_eoi(VFIODevice *vbasedev)
      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
      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() ||
          vdev->intx.route.mode != PCI_INTX_ENABLED ||
          !kvm_resamplefds_enabled()) {
-        return;
+        return true;
      }

/* 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); - return;

+    return true;

fail_vfio:

      kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &vdev->intx.interrupt,
@@ -171,6 +171,9 @@ fail_irqfd:
  fail:
      qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev);
      vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);
+    return false;
+#else
+    return true;
  #endif
  }

@@ -226,8 +229,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route)

          return;
      }

- vfio_intx_enable_kvm(vdev, &err);

-    if (err) {
+    if (!vfio_intx_enable_kvm(vdev, &err)) {
          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;
      }

- vfio_intx_enable_kvm(vdev, &err);

-    if (err) {
+    if (!vfio_intx_enable_kvm(vdev, &err)) {
          warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
      }