[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 40/42] vfio/container: Remove vfio_container_init()
From: |
Cédric Le Goater |
Subject: |
[PULL 40/42] vfio/container: Remove vfio_container_init() |
Date: |
Mon, 24 Jun 2024 23:24:54 +0200 |
It's now empty.
Reviewed-by: Zhenzhong Duan <[email protected]>
Reviewed-by: Eric Auger <[email protected]>
Tested-by: Eric Auger <[email protected]>
Signed-off-by: Cédric Le Goater <[email protected]>
---
include/hw/vfio/vfio-container-base.h | 2 --
hw/vfio/container-base.c | 5 -----
hw/vfio/container.c | 3 ---
hw/vfio/iommufd.c | 1 -
4 files changed, 11 deletions(-)
diff --git a/include/hw/vfio/vfio-container-base.h
b/include/hw/vfio/vfio-container-base.h
index
6b57cd8e7f5d7d2817f6e3b96ce4566d2630bb12..6242a62771caa8cf19440a53ad6f4db862ca12d7
100644
--- a/include/hw/vfio/vfio-container-base.h
+++ b/include/hw/vfio/vfio-container-base.h
@@ -86,8 +86,6 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase
*bcontainer,
int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp);
-void vfio_container_init(VFIOContainerBase *bcontainer,
- const VFIOIOMMUClass *ops);
void vfio_container_destroy(VFIOContainerBase *bcontainer);
diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c
index
24669d4d7472f49ac3adf2618a32bf7d82c5c344..970ae2356a92f87df44e1dd58ff8c67045a24ef1
100644
--- a/hw/vfio/container-base.c
+++ b/hw/vfio/container-base.c
@@ -83,11 +83,6 @@ int vfio_container_query_dirty_bitmap(const
VFIOContainerBase *bcontainer,
errp);
}
-void vfio_container_init(VFIOContainerBase *bcontainer,
- const VFIOIOMMUClass *ops)
-{
-}
-
void vfio_container_destroy(VFIOContainerBase *bcontainer)
{
VFIOGuestIOMMU *giommu, *tmp;
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index
a2f5fbad00cd228e27a47df5cd683dbb34296113..3f2032d5c496de078c277ebacc49d7db89f4cc65
100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -419,7 +419,6 @@ static VFIOContainer *vfio_create_container(int fd,
VFIOGroup *group,
Error **errp)
{
int iommu_type;
- const VFIOIOMMUClass *vioc;
const char *vioc_name;
VFIOContainer *container;
@@ -433,12 +432,10 @@ static VFIOContainer *vfio_create_container(int fd,
VFIOGroup *group,
}
vioc_name = vfio_get_iommu_class_name(iommu_type);
- vioc = VFIO_IOMMU_CLASS(object_class_by_name(vioc_name));
container = VFIO_IOMMU_LEGACY(object_new(vioc_name));
container->fd = fd;
container->iommu_type = iommu_type;
- vfio_container_init(&container->bcontainer, vioc);
return container;
}
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index
7bc76f80b48ea5422e68fd4d4cb3f5bca90993f6..09b71a6617807c621275c74b924cfd39eb643961
100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -357,7 +357,6 @@ static bool iommufd_cdev_attach(const char *name,
VFIODevice *vbasedev,
container->ioas_id = ioas_id;
bcontainer = &container->bcontainer;
- vfio_container_init(bcontainer, iommufd_vioc);
vfio_address_space_insert(space, bcontainer);
if (!iommufd_cdev_attach_container(vbasedev, container, errp)) {
--
2.45.2
- [PULL 28/42] vfio/common: Move dirty tracking ranges update to helper, (continued)
- [PULL 28/42] vfio/common: Move dirty tracking ranges update to helper, Cédric Le Goater, 2024/06/24
- [PULL 31/42] vfio/container: Simplify vfio_container_init(), Cédric Le Goater, 2024/06/24
- [PULL 34/42] vfio/container: Introduce vfio_create_container(), Cédric Le Goater, 2024/06/24
- [PULL 35/42] vfio/container: Discover IOMMU type before creating the container, Cédric Le Goater, 2024/06/24
- [PULL 37/42] vfio/container: Switch to QOM, Cédric Le Goater, 2024/06/24
- [PULL 38/42] vfio/container: Introduce an instance_init() handler, Cédric Le Goater, 2024/06/24
- [PULL 36/42] vfio/container: Change VFIOContainerBase to use QOM, Cédric Le Goater, 2024/06/24
- [PULL 39/42] vfio/container: Remove VFIOContainerBase::ops, Cédric Le Goater, 2024/06/24
- [PULL 41/42] vfio/container: Introduce vfio_iommu_legacy_instance_init(), Cédric Le Goater, 2024/06/24
- [PULL 42/42] vfio/container: Move vfio_container_destroy() to an instance_finalize() handler, Cédric Le Goater, 2024/06/24
- [PULL 40/42] vfio/container: Remove vfio_container_init(),
Cédric Le Goater <=
- Re: [PULL 00/42] vfio queue, Richard Henderson, 2024/06/25