67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
|
From edfc1ee2a1854d180ffad92e70212535a2ca668c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
||
|
|
Date: Thu, 21 Dec 2023 10:45:17 +0800
|
||
|
|
Subject: [PATCH 062/101] vfio/container: Rename vfio_init_container to
|
||
|
|
vfio_set_iommu
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-MergeRequest: 211: IOMMUFD backend backport
|
||
|
|
RH-Jira: RHEL-19302 RHEL-21057
|
||
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-Acked-by: Sebastian Ott <sebott@redhat.com>
|
||
|
|
RH-Commit: [61/67] 5e7f956379b54fe6fa7e078ec17e71325aa109af (eauger1/centos-qemu-kvm)
|
||
|
|
|
||
|
|
vfio_container_init() and vfio_init_container() names are confusing
|
||
|
|
especially when we see vfio_init_container() calls vfio_container_init().
|
||
|
|
|
||
|
|
vfio_container_init() operates on base container which is consistent
|
||
|
|
with all routines handling 'VFIOContainerBase *' ops.
|
||
|
|
|
||
|
|
vfio_init_container() operates on legacy container and setup IOMMU
|
||
|
|
context with ioctl(VFIO_SET_IOMMU).
|
||
|
|
|
||
|
|
So choose to rename vfio_init_container to vfio_set_iommu to avoid
|
||
|
|
the confusion.
|
||
|
|
|
||
|
|
No functional change intended.
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit 9f734a117cbf63b03577b46c8cad8ad88ec6dced)
|
||
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
---
|
||
|
|
hw/vfio/container.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
|
||
|
|
index 8d334f52f2..bd25b9fbad 100644
|
||
|
|
--- a/hw/vfio/container.c
|
||
|
|
+++ b/hw/vfio/container.c
|
||
|
|
@@ -392,8 +392,8 @@ static const VFIOIOMMUClass *vfio_get_iommu_class(int iommu_type, Error **errp)
|
||
|
|
return VFIO_IOMMU_CLASS(klass);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int vfio_init_container(VFIOContainer *container, int group_fd,
|
||
|
|
- VFIOAddressSpace *space, Error **errp)
|
||
|
|
+static int vfio_set_iommu(VFIOContainer *container, int group_fd,
|
||
|
|
+ VFIOAddressSpace *space, Error **errp)
|
||
|
|
{
|
||
|
|
int iommu_type, ret;
|
||
|
|
const VFIOIOMMUClass *vioc;
|
||
|
|
@@ -616,7 +616,7 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
|
||
|
|
container->fd = fd;
|
||
|
|
bcontainer = &container->bcontainer;
|
||
|
|
|
||
|
|
- ret = vfio_init_container(container, group->fd, space, errp);
|
||
|
|
+ ret = vfio_set_iommu(container, group->fd, space, errp);
|
||
|
|
if (ret) {
|
||
|
|
goto free_container_exit;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|