mirror of https://github.com/xemu-project/xemu.git
vfio/container: Simplify vfio_container_init()
Assign the base container VFIOAddressSpace 'space' pointer in vfio_address_space_insert(). The ultimate goal is to remove vfio_container_init() and instead rely on an .instance_init() handler to perfom the initialization of VFIOContainerBase. To be noted that vfio_connect_container() will assign the 'space' pointer later in the execution flow. This should not have any consequence. Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Tested-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
b7b79588eb
commit
09181a8e97
|
@ -1512,6 +1512,7 @@ void vfio_address_space_insert(VFIOAddressSpace *space,
|
|||
VFIOContainerBase *bcontainer)
|
||||
{
|
||||
QLIST_INSERT_HEAD(&space->containers, bcontainer, next);
|
||||
bcontainer->space = space;
|
||||
}
|
||||
|
||||
struct vfio_device_info *vfio_get_device_info(int fd)
|
||||
|
|
|
@ -71,11 +71,10 @@ int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
|
|||
errp);
|
||||
}
|
||||
|
||||
void vfio_container_init(VFIOContainerBase *bcontainer, VFIOAddressSpace *space,
|
||||
void vfio_container_init(VFIOContainerBase *bcontainer,
|
||||
const VFIOIOMMUClass *ops)
|
||||
{
|
||||
bcontainer->ops = ops;
|
||||
bcontainer->space = space;
|
||||
bcontainer->error = NULL;
|
||||
bcontainer->dirty_pages_supported = false;
|
||||
bcontainer->dma_max_mappings = 0;
|
||||
|
|
|
@ -394,7 +394,7 @@ static const VFIOIOMMUClass *vfio_get_iommu_class(int iommu_type, Error **errp)
|
|||
}
|
||||
|
||||
static bool vfio_set_iommu(VFIOContainer *container, int group_fd,
|
||||
VFIOAddressSpace *space, Error **errp)
|
||||
Error **errp)
|
||||
{
|
||||
int iommu_type;
|
||||
const VFIOIOMMUClass *vioc;
|
||||
|
@ -432,7 +432,7 @@ static bool vfio_set_iommu(VFIOContainer *container, int group_fd,
|
|||
return false;
|
||||
}
|
||||
|
||||
vfio_container_init(&container->bcontainer, space, vioc);
|
||||
vfio_container_init(&container->bcontainer, vioc);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -614,7 +614,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,
|
|||
container->fd = fd;
|
||||
bcontainer = &container->bcontainer;
|
||||
|
||||
if (!vfio_set_iommu(container, group->fd, space, errp)) {
|
||||
if (!vfio_set_iommu(container, group->fd, errp)) {
|
||||
goto free_container_exit;
|
||||
}
|
||||
|
||||
|
|
|
@ -357,7 +357,7 @@ static bool iommufd_cdev_attach(const char *name, VFIODevice *vbasedev,
|
|||
container->ioas_id = ioas_id;
|
||||
|
||||
bcontainer = &container->bcontainer;
|
||||
vfio_container_init(bcontainer, space, iommufd_vioc);
|
||||
vfio_container_init(bcontainer, iommufd_vioc);
|
||||
vfio_address_space_insert(space, bcontainer);
|
||||
|
||||
if (!iommufd_cdev_attach_container(vbasedev, container, errp)) {
|
||||
|
|
|
@ -87,7 +87,6 @@ int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
|
|||
VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp);
|
||||
|
||||
void vfio_container_init(VFIOContainerBase *bcontainer,
|
||||
VFIOAddressSpace *space,
|
||||
const VFIOIOMMUClass *ops);
|
||||
void vfio_container_destroy(VFIOContainerBase *bcontainer);
|
||||
|
||||
|
|
Loading…
Reference in New Issue