ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vfio/container: Make vfio_set_iommu() return bool 

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>
This commit is contained in:
Zhenzhong Duan 2024-05-07 14:42:48 +08:00 committed by Cédric Le Goater
parent f6c12eaca5
commit 534ed2e472
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/vfio/container.c
View File

@ -393,21 +393,20 @@ static const VFIOIOMMUClass *vfio_get_iommu_class(int iommu_type, Error **errp)
return VFIO_IOMMU_CLASS(klass); return VFIO_IOMMU_CLASS(klass);
} }
static int vfio_set_iommu(VFIOContainer *container, int group_fd, static bool vfio_set_iommu(VFIOContainer *container, int group_fd,
VFIOAddressSpace *space, Error **errp) VFIOAddressSpace *space, Error **errp)
{ {
int iommu_type, ret; int iommu_type;
const VFIOIOMMUClass *vioc; const VFIOIOMMUClass *vioc;
iommu_type = vfio_get_iommu_type(container, errp); iommu_type = vfio_get_iommu_type(container, errp);
if (iommu_type < 0) { if (iommu_type < 0) {
return iommu_type; return false;
} }
ret = ioctl(group_fd, VFIO_GROUP_SET_CONTAINER, &container->fd); if (ioctl(group_fd, VFIO_GROUP_SET_CONTAINER, &container->fd)) {
if (ret) {
error_setg_errno(errp, errno, "Failed to set group container"); error_setg_errno(errp, errno, "Failed to set group container");
return -errno; return false;
} }
while (ioctl(container->fd, VFIO_SET_IOMMU, iommu_type)) { while (ioctl(container->fd, VFIO_SET_IOMMU, iommu_type)) {
@ -422,7 +421,7 @@ static int vfio_set_iommu(VFIOContainer *container, int group_fd,
continue; continue;
} }
error_setg_errno(errp, errno, "Failed to set iommu for container"); error_setg_errno(errp, errno, "Failed to set iommu for container");
return -errno; return false;
} }
container->iommu_type = iommu_type; 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); vioc = vfio_get_iommu_class(iommu_type, errp);
if (!vioc) { if (!vioc) {
error_setg(errp, "No available IOMMU models"); error_setg(errp, "No available IOMMU models");
return -EINVAL; return false;
} }
vfio_container_init(&container->bcontainer, space, vioc); vfio_container_init(&container->bcontainer, space, vioc);
return 0; return true;
} }
static int vfio_get_iommu_info(VFIOContainer *container, static int vfio_get_iommu_info(VFIOContainer *container,
@ -615,8 +614,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,
container->fd = fd; container->fd = fd;
bcontainer = &container->bcontainer; bcontainer = &container->bcontainer;
ret = vfio_set_iommu(container, group->fd, space, errp); if (!vfio_set_iommu(container, group->fd, space, errp)) {
if (ret) {
goto free_container_exit; goto free_container_exit;
} }