From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 25/47] vfio/container: Make vfio_set_iommu() return bool
Date: Wed, 22 May 2024 11:54:20 +0200 [thread overview]
Message-ID: <20240522095442.195243-26-clg@redhat.com> (raw)
In-Reply-To: <20240522095442.195243-1-clg@redhat.com>
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
This is to follow the coding standand to return bool if 'Error **'
is used to pass error.
Suggested-by: Cédric Le Goater <clg@redhat.com>
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>
---
hw/vfio/container.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 802828ddff061fef25b8e4c997a68348d4be9892..e330b2897423b97fee467884f4237669ceff4756 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -393,21 +393,20 @@ static const VFIOIOMMUClass *vfio_get_iommu_class(int iommu_type, Error **errp)
return VFIO_IOMMU_CLASS(klass);
}
-static int vfio_set_iommu(VFIOContainer *container, int group_fd,
- VFIOAddressSpace *space, Error **errp)
+static bool vfio_set_iommu(VFIOContainer *container, int group_fd,
+ VFIOAddressSpace *space, Error **errp)
{
- int iommu_type, ret;
+ int iommu_type;
const VFIOIOMMUClass *vioc;
iommu_type = vfio_get_iommu_type(container, errp);
if (iommu_type < 0) {
- return iommu_type;
+ return false;
}
- ret = ioctl(group_fd, VFIO_GROUP_SET_CONTAINER, &container->fd);
- if (ret) {
+ if (ioctl(group_fd, VFIO_GROUP_SET_CONTAINER, &container->fd)) {
error_setg_errno(errp, errno, "Failed to set group container");
- return -errno;
+ return false;
}
while (ioctl(container->fd, VFIO_SET_IOMMU, iommu_type)) {
@@ -422,7 +421,7 @@ static int vfio_set_iommu(VFIOContainer *container, int group_fd,
continue;
}
error_setg_errno(errp, errno, "Failed to set iommu for container");
- return -errno;
+ return false;
}
container->iommu_type = iommu_type;
@@ -430,11 +429,11 @@ static int vfio_set_iommu(VFIOContainer *container, int group_fd,
vioc = vfio_get_iommu_class(iommu_type, errp);
if (!vioc) {
error_setg(errp, "No available IOMMU models");
- return -EINVAL;
+ return false;
}
vfio_container_init(&container->bcontainer, space, vioc);
- return 0;
+ return true;
}
static int vfio_get_iommu_info(VFIOContainer *container,
@@ -615,8 +614,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,
container->fd = fd;
bcontainer = &container->bcontainer;
- ret = vfio_set_iommu(container, group->fd, space, errp);
- if (ret) {
+ if (!vfio_set_iommu(container, group->fd, space, errp)) {
goto free_container_exit;
}
--
2.45.1
next prev parent reply other threads:[~2024-05-22 9:58 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 9:53 [PULL 00/47] vfio queue Cédric Le Goater
2024-05-22 9:53 ` [PULL 01/47] vfio: Add Error** argument to .set_dirty_page_tracking() handler Cédric Le Goater
2024-05-22 9:53 ` [PULL 02/47] vfio: Add Error** argument to vfio_devices_dma_logging_start() Cédric Le Goater
2024-05-22 9:53 ` [PULL 03/47] migration: Extend migration_file_set_error() with Error* argument Cédric Le Goater
2024-05-22 9:53 ` [PULL 04/47] vfio/migration: Add an Error** argument to vfio_migration_set_state() Cédric Le Goater
2024-05-22 9:54 ` [PULL 05/47] vfio/migration: Add Error** argument to .vfio_save_config() handler Cédric Le Goater
2024-05-22 9:54 ` [PULL 06/47] vfio: Reverse test on vfio_get_xlat_addr() Cédric Le Goater
2024-05-22 9:54 ` [PULL 07/47] memory: Add Error** argument to memory_get_xlat_addr() Cédric Le Goater
2024-05-22 9:54 ` [PULL 08/47] vfio: Add Error** argument to .get_dirty_bitmap() handler Cédric Le Goater
2024-05-22 9:54 ` [PULL 09/47] vfio: Also trace event failures in vfio_save_complete_precopy() Cédric Le Goater
2024-05-22 9:54 ` [PULL 10/47] vfio/ap: Use g_autofree variable in vfio_ap_register_irq_notifier() Cédric Le Goater
2024-05-22 9:54 ` [PULL 11/47] vfio/ap: Make vfio_ap_register_irq_notifier() return a bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 12/47] vfio/ccw: Use g_autofree variable in vfio_ccw_register_irq_notifier() Cédric Le Goater
2024-05-22 9:54 ` [PULL 13/47] vfio/ccw: Make vfio_ccw_register_irq_notifier() return a bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 14/47] vfio/pci: migration: Skip config space check for Vendor Specific Information in VSC during restore/load Cédric Le Goater
2024-05-22 9:54 ` [PULL 15/47] qapi/vfio: Add VFIO migration QAPI event Cédric Le Goater
2024-05-22 9:54 ` [PULL 16/47] vfio/migration: Emit " Cédric Le Goater
2024-05-22 9:54 ` [PULL 17/47] vfio/migration: Don't emit STOP_COPY VFIO migration QAPI event twice Cédric Le Goater
2024-05-22 9:54 ` [PULL 18/47] vfio/migration: Enhance VFIO migration state tracing Cédric Le Goater
2024-05-22 9:54 ` [PULL 19/47] vfio/pci: Use g_autofree in vfio_realize Cédric Le Goater
2024-05-22 9:54 ` [PULL 20/47] vfio/pci: Use g_autofree in iommufd_cdev_get_info_iova_range() Cédric Le Goater
2024-05-22 9:54 ` [PULL 21/47] vfio: Make VFIOIOMMUClass::attach_device() and its wrapper return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 22/47] vfio: Make VFIOIOMMUClass::setup() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 23/47] vfio: Make VFIOIOMMUClass::add_window() and its wrapper " Cédric Le Goater
2024-05-22 9:54 ` [PULL 24/47] vfio/container: Make vfio_connect_container() " Cédric Le Goater
2024-05-22 9:54 ` Cédric Le Goater [this message]
2024-05-22 9:54 ` [PULL 26/47] vfio/container: Make vfio_get_device() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 27/47] vfio/iommufd: Make iommufd_cdev_*() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 28/47] vfio/cpr: Make vfio_cpr_register_container() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 29/47] backends/iommufd: Make iommufd_backend_*() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 30/47] vfio/display: Fix error path in call site of ramfb_setup() Cédric Le Goater
2024-05-22 9:54 ` [PULL 31/47] vfio/display: Make vfio_display_*() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 32/47] vfio/helpers: Use g_autofree in vfio_set_irq_signaling() Cédric Le Goater
2024-05-22 9:54 ` [PULL 33/47] vfio/helpers: Make vfio_set_irq_signaling() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 34/47] vfio/helpers: Make vfio_device_get_name() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 35/47] vfio/platform: Make vfio_populate_device() and vfio_base_device_init() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 36/47] vfio/ccw: Make vfio_ccw_get_region() return a bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 37/47] vfio/pci: Make vfio_intx_enable_kvm() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 38/47] vfio/pci: Make vfio_pci_relocate_msix() and vfio_msix_early_setup() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 39/47] vfio/pci: Make vfio_populate_device() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 40/47] vfio/pci: Make vfio_intx_enable() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 41/47] vfio/pci: Make vfio_populate_vga() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 42/47] vfio/pci: Make capability related functions " Cédric Le Goater
2024-05-22 9:54 ` [PULL 43/47] vfio/pci: Use g_autofree for vfio_region_info pointer Cédric Le Goater
2024-05-22 9:54 ` [PULL 44/47] vfio/pci-quirks: Make vfio_pci_igd_opregion_init() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 45/47] vfio/pci-quirks: Make vfio_add_*_cap() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 46/47] vfio: Use g_autofree in all call site of vfio_get_region_info() Cédric Le Goater
2024-05-22 9:54 ` [PULL 47/47] vfio/igd: Use g_autofree in vfio_probe_igd_bar4_quirk() Cédric Le Goater
2024-05-22 22:31 ` [PULL 00/47] vfio queue Richard Henderson
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=20240522095442.195243-26-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhenzhong.duan@intel.com \
/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).