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

vfio/helpers: Refactor vfio_region_mmap() error handling

Browse Source 
Move error handling code to the end of the function so that it can more
easily be shared by new mmap failure conditions.  No functional change
intended.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Alex Williamson 2024-10-22 14:08:28 -06:00 committed by Cédric Le Goater
parent fa4e20defe
commit 49915c0d2c
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/vfio/helpers.c
View File

@ -395,7 +395,7 @@ static void vfio_subregion_unmap(VFIORegion *region, int index)
int vfio_region_mmap(VFIORegion *region)
{
int i, prot = 0;
int i, ret, prot = 0;
char *name;
if (!region->mem) {
@ -411,22 +411,8 @@ int vfio_region_mmap(VFIORegion *region)
region->fd_offset +
region->mmaps[i].offset);
if (region->mmaps[i].mmap == MAP_FAILED) {
int ret = -errno;
trace_vfio_region_mmap_fault(memory_region_name(region->mem), i,
region->fd_offset +
region->mmaps[i].offset,
region->fd_offset +
region->mmaps[i].offset +
region->mmaps[i].size - 1, ret);
region->mmaps[i].mmap = NULL;
for (i--; i >= 0; i--) {
vfio_subregion_unmap(region, i);
}
return ret;
ret = -errno;
goto no_mmap;
}
name = g_strdup_printf("%s mmaps[%d]",
@ -446,6 +432,20 @@ int vfio_region_mmap(VFIORegion *region)
}
return 0;
no_mmap:
trace_vfio_region_mmap_fault(memory_region_name(region->mem), i,
region->fd_offset + region->mmaps[i].offset,
region->fd_offset + region->mmaps[i].offset +
region->mmaps[i].size - 1, ret);
region->mmaps[i].mmap = NULL;
for (i--; i >= 0; i--) {
vfio_subregion_unmap(region, i);
}
return ret;
}
void vfio_region_unmap(VFIORegion *region)