From: Zhenzhong Duan <zhenzhong.duan@intel.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, clg@redhat.com,
eric.auger@redhat.com, chao.p.peng@intel.com,
Zhenzhong Duan <zhenzhong.duan@intel.com>
Subject: [PATCH 08/16] vfio/pci: Make vfio_intx_enable_kvm() return a bool
Date: Wed, 15 May 2024 16:20:33 +0800 [thread overview]
Message-ID: <20240515082041.556571-9-zhenzhong.duan@intel.com> (raw)
In-Reply-To: <20240515082041.556571-1-zhenzhong.duan@intel.com>
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>
---
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);
}
--
2.34.1
next prev parent reply other threads:[~2024-05-15 8:27 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-15 8:20 [PATCH 00/16] VFIO: misc cleanups part2 Zhenzhong Duan
2024-05-15 8:20 ` [PATCH 01/16] vfio/display: Fix error path in call site of ramfb_setup() Zhenzhong Duan
2024-05-21 12:09 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 02/16] vfio/display: Make vfio_display_*() return bool Zhenzhong Duan
2024-05-21 12:14 ` Cédric Le Goater
2024-05-22 4:45 ` Duan, Zhenzhong
2024-05-15 8:20 ` [PATCH 03/16] vfio/helpers: Use g_autofree in hw/vfio/helpers.c Zhenzhong Duan
2024-05-21 12:19 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 04/16] vfio/helpers: Make vfio_set_irq_signaling() return bool Zhenzhong Duan
2024-05-21 12:24 ` Cédric Le Goater
2024-05-24 13:16 ` Anthony Krowiak
2024-05-27 3:18 ` Duan, Zhenzhong
2024-05-15 8:20 ` [PATCH 05/16] vfio/helpers: Make vfio_device_get_name() " Zhenzhong Duan
2024-05-21 12:25 ` Cédric Le Goater
2024-05-24 13:16 ` Anthony Krowiak
2024-05-15 8:20 ` [PATCH 06/16] vfio/platform: Make vfio_populate_device() and vfio_base_device_init() " Zhenzhong Duan
2024-05-21 12:27 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 07/16] vfio/ccw: Make vfio_ccw_get_region() return a bool Zhenzhong Duan
2024-05-21 12:34 ` Cédric Le Goater
2024-05-15 8:20 ` Zhenzhong Duan [this message]
2024-05-21 12:36 ` [PATCH 08/16] vfio/pci: Make vfio_intx_enable_kvm() " Cédric Le Goater
2024-05-15 8:20 ` [PATCH 09/16] vfio/pci: Make vfio_pci_relocate_msix() and vfio_msix_early_setup() " Zhenzhong Duan
2024-05-21 12:38 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 10/16] vfio/pci: Make vfio_populate_device() " Zhenzhong Duan
2024-05-21 12:39 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 11/16] vfio/pci: Make vfio_intx_enable() return bool Zhenzhong Duan
2024-05-21 12:42 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 12/16] vfio/pci: Make vfio_populate_vga() " Zhenzhong Duan
2024-05-21 12:44 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 13/16] vfio/pci: Make capability related functions " Zhenzhong Duan
2024-05-21 12:54 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 14/16] vfio/pci: Use g_autofree for vfio_region_info pointer Zhenzhong Duan
2024-05-21 12:48 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 15/16] vfio/pci-quirks: Make vfio_pci_igd_opregion_init() return bool Zhenzhong Duan
2024-05-21 12:48 ` Cédric Le Goater
2024-05-15 8:20 ` [PATCH 16/16] vfio/pci-quirks: Make vfio_add_*_cap() " Zhenzhong Duan
2024-05-21 12:54 ` Cédric Le Goater
2024-05-16 16:48 ` [PATCH 00/16] VFIO: misc cleanups part2 Cédric Le Goater
2024-05-17 9:25 ` Duan, Zhenzhong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240515082041.556571-9-zhenzhong.duan@intel.com \
--to=zhenzhong.duan@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@intel.com \
--cc=clg@redhat.com \
--cc=eric.auger@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).