ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vfio/common: Rename VFIOGuestIOMMU::iommu into ::iommu_mr 

Rename VFIOGuestIOMMU iommu field into iommu_mr. Then it becomes clearer
it is an IOMMU memory region.

no functional change intended

Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20220502094223.36384-4-yi.l.liu@intel.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Yi Liu 2022-05-02 02:42:23 -07:00 committed by Alex Williamson
parent 0d570a2572
commit 44ee6aaae0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/vfio/common.c
View File

@ -1017,7 +1017,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
* device emulation the VFIO iommu handles to use). * device emulation the VFIO iommu handles to use).
*/ */
giommu = g_malloc0(sizeof(*giommu)); giommu = g_malloc0(sizeof(*giommu));
giommu->iommu = iommu_mr; giommu->iommu_mr = iommu_mr;
giommu->iommu_offset = section->offset_within_address_space - giommu->iommu_offset = section->offset_within_address_space -
section->offset_within_region; section->offset_within_region;
giommu->container = container; giommu->container = container;
@ -1032,7 +1032,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
int128_get64(llend), int128_get64(llend),
iommu_idx); iommu_idx);
ret = memory_region_iommu_set_page_size_mask(giommu->iommu, ret = memory_region_iommu_set_page_size_mask(giommu->iommu_mr,
container->pgsizes, container->pgsizes,
&err); &err);
if (ret) { if (ret) {
@ -1047,7 +1047,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
goto fail; goto fail;
} }
QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next);
memory_region_iommu_replay(giommu->iommu, &giommu->n); memory_region_iommu_replay(giommu->iommu_mr, &giommu->n);
return; return;
} }
@ -1153,7 +1153,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
VFIOGuestIOMMU *giommu; VFIOGuestIOMMU *giommu;
QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) {
if (MEMORY_REGION(giommu->iommu) == section->mr && if (MEMORY_REGION(giommu->iommu_mr) == section->mr &&
giommu->n.start == section->offset_within_region) { giommu->n.start == section->offset_within_region) {
memory_region_unregister_iommu_notifier(section->mr, memory_region_unregister_iommu_notifier(section->mr,
&giommu->n); &giommu->n);
@ -1418,11 +1418,11 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *container,
VFIOGuestIOMMU *giommu; VFIOGuestIOMMU *giommu;
QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) {
if (MEMORY_REGION(giommu->iommu) == section->mr && if (MEMORY_REGION(giommu->iommu_mr) == section->mr &&
giommu->n.start == section->offset_within_region) { giommu->n.start == section->offset_within_region) {
Int128 llend; Int128 llend;
vfio_giommu_dirty_notifier gdn = { .giommu = giommu }; vfio_giommu_dirty_notifier gdn = { .giommu = giommu };
int idx = memory_region_iommu_attrs_to_index(giommu->iommu, int idx = memory_region_iommu_attrs_to_index(giommu->iommu_mr,
MEMTXATTRS_UNSPECIFIED); MEMTXATTRS_UNSPECIFIED);
llend = int128_add(int128_make64(section->offset_within_region), llend = int128_add(int128_make64(section->offset_within_region),
@ -1435,7 +1435,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *container,
section->offset_within_region, section->offset_within_region,
int128_get64(llend), int128_get64(llend),
idx); idx);
memory_region_iommu_replay(giommu->iommu, &gdn.n); memory_region_iommu_replay(giommu->iommu_mr, &gdn.n);
break; break;
} }
} }
@ -2270,7 +2270,7 @@ static void vfio_disconnect_container(VFIOGroup *group)
QLIST_FOREACH_SAFE(giommu, &container->giommu_list, giommu_next, tmp) { QLIST_FOREACH_SAFE(giommu, &container->giommu_list, giommu_next, tmp) {
memory_region_unregister_iommu_notifier( memory_region_unregister_iommu_notifier(
MEMORY_REGION(giommu->iommu), &giommu->n); MEMORY_REGION(giommu->iommu_mr), &giommu->n);
QLIST_REMOVE(giommu, giommu_next); QLIST_REMOVE(giommu, giommu_next);
g_free(giommu); g_free(giommu);
} }

2
include/hw/vfio/vfio-common.h
View File

@ -98,7 +98,7 @@ typedef struct VFIOContainer {
typedef struct VFIOGuestIOMMU { typedef struct VFIOGuestIOMMU {
VFIOContainer *container; VFIOContainer *container;
IOMMUMemoryRegion *iommu; IOMMUMemoryRegion *iommu_mr;
hwaddr iommu_offset; hwaddr iommu_offset;
IOMMUNotifier n; IOMMUNotifier n;
QLIST_ENTRY(VFIOGuestIOMMU) giommu_next; QLIST_ENTRY(VFIOGuestIOMMU) giommu_next;