motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vfio/container: Make vfio_connect_container() return bool

Browse source 
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:47 +08:00 • committed by Cédric Le Goater
parent 33e4c22fd1
commit f6c12eaca5
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/vfio/container.c
View file

@ -536,8 +536,8 @@ static bool vfio_legacy_setup(VFIOContainerBase *bcontainer, Error **errp)
return true; return true;
} }
static int vfio_connect_container(VFIOGroup *group, AddressSpace *as, static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,
Error **errp) Error **errp)
{ {
VFIOContainer *container; VFIOContainer *container;
VFIOContainerBase *bcontainer; VFIOContainerBase *bcontainer;
@ -589,19 +589,18 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
error_report("vfio: error disconnecting group %d from" error_report("vfio: error disconnecting group %d from"
" container", group->groupid); " container", group->groupid);
} }
return ret; return false;
} }
group->container = container; group->container = container;
QLIST_INSERT_HEAD(&container->group_list, group, container_next); QLIST_INSERT_HEAD(&container->group_list, group, container_next);
vfio_kvm_device_add_group(group); vfio_kvm_device_add_group(group);
return 0; return true;
} }
} }
fd = qemu_open_old("/dev/vfio/vfio", O_RDWR); fd = qemu_open_old("/dev/vfio/vfio", O_RDWR);
if (fd < 0) { if (fd < 0) {
error_setg_errno(errp, errno, "failed to open /dev/vfio/vfio"); error_setg_errno(errp, errno, "failed to open /dev/vfio/vfio");
ret = -errno;
goto put_space_exit; goto put_space_exit;
} }
@ -609,7 +608,6 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
if (ret != VFIO_API_VERSION) { if (ret != VFIO_API_VERSION) {
error_setg(errp, "supported vfio version: %d, " error_setg(errp, "supported vfio version: %d, "
"reported version: %d", VFIO_API_VERSION, ret); "reported version: %d", VFIO_API_VERSION, ret);
ret = -EINVAL;
goto close_fd_exit; goto close_fd_exit;
} }
@ -636,7 +634,6 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
assert(bcontainer->ops->setup); assert(bcontainer->ops->setup);
if (!bcontainer->ops->setup(bcontainer, errp)) { if (!bcontainer->ops->setup(bcontainer, errp)) {
ret = -EINVAL;
goto enable_discards_exit; goto enable_discards_exit;
} }
@ -652,7 +649,6 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
memory_listener_register(&bcontainer->listener, bcontainer->space->as); memory_listener_register(&bcontainer->listener, bcontainer->space->as);
if (bcontainer->error) { if (bcontainer->error) {
ret = -1;
error_propagate_prepend(errp, bcontainer->error, error_propagate_prepend(errp, bcontainer->error,
"memory listener initialization failed: "); "memory listener initialization failed: ");
goto listener_release_exit; goto listener_release_exit;
@ -660,7 +656,7 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
bcontainer->initialized = true; bcontainer->initialized = true;
return 0; return true;
listener_release_exit: listener_release_exit:
QLIST_REMOVE(group, container_next); QLIST_REMOVE(group, container_next);
QLIST_REMOVE(bcontainer, next); QLIST_REMOVE(bcontainer, next);
@ -685,7 +681,7 @@ close_fd_exit:
put_space_exit: put_space_exit:
vfio_put_address_space(space); vfio_put_address_space(space);
return ret; return false;
} }
static void vfio_disconnect_container(VFIOGroup *group) static void vfio_disconnect_container(VFIOGroup *group)
@ -772,7 +768,7 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp)
group->groupid = groupid; group->groupid = groupid;
QLIST_INIT(&group->device_list); QLIST_INIT(&group->device_list);
if (vfio_connect_container(group, as, errp)) { if (!vfio_connect_container(group, as, errp)) {
error_prepend(errp, "failed to setup container for group %d: ", error_prepend(errp, "failed to setup container for group %d: ",
groupid); groupid);
goto close_fd_exit; goto close_fd_exit;