mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio/container: Switch to QOM

Browse Source 
Instead of allocating the container struct, create a QOM object of the
appropriate type.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Cédric Le Goater 2024-06-17 08:34:04 +02:00
parent 504d297e10
commit 938026053f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/vfio/container.c
View File

@ -435,7 +435,7 @@ static VFIOContainer *vfio_create_container(int fd, VFIOGroup *group,
vioc_name = vfio_get_iommu_class_name(iommu_type); vioc_name = vfio_get_iommu_class_name(iommu_type);
vioc = VFIO_IOMMU_CLASS(object_class_by_name(vioc_name)); vioc = VFIO_IOMMU_CLASS(object_class_by_name(vioc_name));
container = g_malloc0(sizeof(*container)); container = VFIO_IOMMU_LEGACY(object_new(vioc_name));
container->fd = fd; container->fd = fd;
container->iommu_type = iommu_type; container->iommu_type = iommu_type;
vfio_container_init(&container->bcontainer, vioc); vfio_container_init(&container->bcontainer, vioc);
@ -674,7 +674,7 @@ unregister_container_exit:
vfio_cpr_unregister_container(bcontainer); vfio_cpr_unregister_container(bcontainer);
free_container_exit: free_container_exit:
g_free(container); object_unref(container);
close_fd_exit: close_fd_exit:
close(fd); close(fd);
@ -718,7 +718,7 @@ static void vfio_disconnect_container(VFIOGroup *group)
trace_vfio_disconnect_container(container->fd); trace_vfio_disconnect_container(container->fd);
vfio_cpr_unregister_container(bcontainer); vfio_cpr_unregister_container(bcontainer);
close(container->fd); close(container->fd);
g_free(container); object_unref(container);
vfio_put_address_space(space); vfio_put_address_space(space);
} }

4
hw/vfio/iommufd.c
View File

@ -239,7 +239,7 @@ static void iommufd_cdev_container_destroy(VFIOIOMMUFDContainer *container)
memory_listener_unregister(&bcontainer->listener); memory_listener_unregister(&bcontainer->listener);
vfio_container_destroy(bcontainer); vfio_container_destroy(bcontainer);
iommufd_backend_free_id(container->be, container->ioas_id); iommufd_backend_free_id(container->be, container->ioas_id);
g_free(container); object_unref(container);
} }
static int iommufd_cdev_ram_block_discard_disable(bool state) static int iommufd_cdev_ram_block_discard_disable(bool state)
@ -352,7 +352,7 @@ static bool iommufd_cdev_attach(const char *name, VFIODevice *vbasedev,
trace_iommufd_cdev_alloc_ioas(vbasedev->iommufd->fd, ioas_id); trace_iommufd_cdev_alloc_ioas(vbasedev->iommufd->fd, ioas_id);
container = g_malloc0(sizeof(*container)); container = VFIO_IOMMU_IOMMUFD(object_new(TYPE_VFIO_IOMMU_IOMMUFD));
container->be = vbasedev->iommufd; container->be = vbasedev->iommufd;
container->ioas_id = ioas_id; container->ioas_id = ioas_id;