Re: [PATCH 11/16] vfio/pci: Make vfio_intx_enable() return bool

2024-05-21 Thread Cédric Le Goater 

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

This is to follow the coding standand in qapi/error.h to return bool
for bool-valued functions.

Suggested-by: Cédric Le Goater 
Signed-off-by: Zhenzhong Duan 



Reviewed-by: Cédric Le Goater 

Thanks,

C.



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

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index c091d21adf..e2ca4507f8 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -261,7 +261,7 @@ static void vfio_irqchip_change(Notifier *notify, void 
*data)
  vfio_intx_update(vdev, >intx.route);
  }
  
-static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)

+static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
  {
  uint8_t pin = vfio_pci_read_config(>pdev, PCI_INTERRUPT_PIN, 1);
  Error *err = NULL;
@@ -270,7 +270,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
  
  
  if (!pin) {

-return 0;
+return true;
  }
  
  vfio_disable_interrupts(vdev);

@@ -292,7 +292,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
  ret = event_notifier_init(>intx.interrupt, 0);
  if (ret) {
  error_setg_errno(errp, -ret, "event_notifier_init failed");
-return ret;
+return false;
  }
  fd = event_notifier_get_fd(>intx.interrupt);
  qemu_set_fd_handler(fd, vfio_intx_interrupt, NULL, vdev);
@@ -301,7 +301,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
  VFIO_IRQ_SET_ACTION_TRIGGER, fd, errp)) {
  qemu_set_fd_handler(fd, NULL, NULL, vdev);
  event_notifier_cleanup(>intx.interrupt);
-return -errno;
+return false;
  }
  
  if (!vfio_intx_enable_kvm(vdev, )) {

@@ -311,7 +311,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
  vdev->interrupt = VFIO_INT_INTx;
  
  trace_vfio_intx_enable(vdev->vbasedev.name);

-return 0;
+return true;
  }
  
  static void vfio_intx_disable(VFIOPCIDevice *vdev)

@@ -836,8 +836,7 @@ static void vfio_msix_disable(VFIOPCIDevice *vdev)
  vfio_disable_irqindex(>vbasedev, VFIO_PCI_MSIX_IRQ_INDEX);
  
  vfio_msi_disable_common(vdev);

-vfio_intx_enable(vdev, );
-if (err) {
+if (!vfio_intx_enable(vdev, )) {
  error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
  }
  
@@ -2450,8 +2449,7 @@ void vfio_pci_post_reset(VFIOPCIDevice *vdev)

  Error *err = NULL;
  int nr;
  
-vfio_intx_enable(vdev, );

-if (err) {
+if (!vfio_intx_enable(vdev, )) {
  error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
  }
  
@@ -3197,8 +3195,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)

   vfio_intx_routing_notifier);
  vdev->irqchip_change_notifier.notify = vfio_irqchip_change;
  kvm_irqchip_add_change_notifier(>irqchip_change_notifier);
-ret = vfio_intx_enable(vdev, errp);
-if (ret) {
+if (!vfio_intx_enable(vdev, errp)) {
  goto out_deregister;
  }
  }

[PATCH 11/16] vfio/pci: Make vfio_intx_enable() return bool

2024-05-15 Thread Zhenzhong Duan 
This is to follow the coding standand in qapi/error.h to return bool
for bool-valued functions.

Suggested-by: Cédric Le Goater 
Signed-off-by: Zhenzhong Duan 
---
 hw/vfio/pci.c | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index c091d21adf..e2ca4507f8 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -261,7 +261,7 @@ static void vfio_irqchip_change(Notifier *notify, void 
*data)
 vfio_intx_update(vdev, >intx.route);
 }
 
-static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
+static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
 {
 uint8_t pin = vfio_pci_read_config(>pdev, PCI_INTERRUPT_PIN, 1);
 Error *err = NULL;
@@ -270,7 +270,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
 
 
 if (!pin) {
-return 0;
+return true;
 }
 
 vfio_disable_interrupts(vdev);
@@ -292,7 +292,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
 ret = event_notifier_init(>intx.interrupt, 0);
 if (ret) {
 error_setg_errno(errp, -ret, "event_notifier_init failed");
-return ret;
+return false;
 }
 fd = event_notifier_get_fd(>intx.interrupt);
 qemu_set_fd_handler(fd, vfio_intx_interrupt, NULL, vdev);
@@ -301,7 +301,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
 VFIO_IRQ_SET_ACTION_TRIGGER, fd, errp)) {
 qemu_set_fd_handler(fd, NULL, NULL, vdev);
 event_notifier_cleanup(>intx.interrupt);
-return -errno;
+return false;
 }
 
 if (!vfio_intx_enable_kvm(vdev, )) {
@@ -311,7 +311,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
 vdev->interrupt = VFIO_INT_INTx;
 
 trace_vfio_intx_enable(vdev->vbasedev.name);
-return 0;
+return true;
 }
 
 static void vfio_intx_disable(VFIOPCIDevice *vdev)
@@ -836,8 +836,7 @@ static void vfio_msix_disable(VFIOPCIDevice *vdev)
 vfio_disable_irqindex(>vbasedev, VFIO_PCI_MSIX_IRQ_INDEX);
 
 vfio_msi_disable_common(vdev);
-vfio_intx_enable(vdev, );
-if (err) {
+if (!vfio_intx_enable(vdev, )) {
 error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
 }
 
@@ -2450,8 +2449,7 @@ void vfio_pci_post_reset(VFIOPCIDevice *vdev)
 Error *err = NULL;
 int nr;
 
-vfio_intx_enable(vdev, );
-if (err) {
+if (!vfio_intx_enable(vdev, )) {
 error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
 }
 
@@ -3197,8 +3195,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
  vfio_intx_routing_notifier);
 vdev->irqchip_change_notifier.notify = vfio_irqchip_change;
 kvm_irqchip_add_change_notifier(>irqchip_change_notifier);
-ret = vfio_intx_enable(vdev, errp);
-if (ret) {
+if (!vfio_intx_enable(vdev, errp)) {
 goto out_deregister;
 }
 }
-- 
2.34.1