motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vfio/spapr: Enhance error handling in vfio_spapr_create_window()

Browse source 
Introduce an Error ** parameter to vfio_spapr_create_window() to enable
structured error reporting. This allows the function to propagate
detailed errors back to callers.

Suggested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Amit Machhiwal <amachhiw@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250408124042.2695955-2-amachhiw@linux.ibm.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Amit Machhiwal 2025-04-08 18:10:41 +05:30 • committed by Cédric Le Goater
parent 10c7f1cf2c
commit 6a7abe1c96
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
hw/vfio/spapr.c
View file

@ -230,9 +230,9 @@ static int vfio_spapr_remove_window(VFIOContainer *container,
return 0;
}
static int vfio_spapr_create_window(VFIOContainer *container,
static bool vfio_spapr_create_window(VFIOContainer *container,
MemoryRegionSection *section,
hwaddr *pgsize)
hwaddr *pgsize, Error **errp)
{
int ret = 0;
VFIOContainerBase *bcontainer = &container->bcontainer;
@ -252,11 +252,11 @@ static int vfio_spapr_create_window(VFIOContainer *container,
pgmask = bcontainer->pgsizes & (pagesize | (pagesize - 1));
pagesize = pgmask ? (1ULL << (63 - clz64(pgmask))) : 0;
if (!pagesize) {
error_report("Host doesn't support page size 0x%"PRIx64
", the supported mask is 0x%lx",
memory_region_iommu_get_min_page_size(iommu_mr),
bcontainer->pgsizes);
return -EINVAL;
error_setg_errno(errp, EINVAL, "Host doesn't support page size 0x%"PRIx64
", the supported mask is 0x%lx",
memory_region_iommu_get_min_page_size(iommu_mr),
bcontainer->pgsizes);
return false;
}
/*
@ -302,17 +302,17 @@ static int vfio_spapr_create_window(VFIOContainer *container,
}
}
if (ret) {
error_report("Failed to create a window, ret = %d (%m)", ret);
return -errno;
error_setg_errno(errp, errno, "Failed to create a window, ret = %d", ret);
return false;
}
if (create.start_addr != section->offset_within_address_space) {
vfio_spapr_remove_window(container, create.start_addr);
error_report("Host doesn't support DMA window at %"HWADDR_PRIx", must be %"PRIx64,
section->offset_within_address_space,
(uint64_t)create.start_addr);
return -EINVAL;
error_setg_errno(errp, EINVAL, "Host doesn't support DMA window at %"HWADDR_PRIx
", must be %"PRIx64, section->offset_within_address_space,
(uint64_t)create.start_addr);
return false;
}
trace_vfio_spapr_create_window(create.page_shift,
create.levels,
@ -320,7 +320,7 @@ static int vfio_spapr_create_window(VFIOContainer *container,
create.start_addr);
*pgsize = pagesize;
return 0;
return true;
}
static bool
@ -377,9 +377,8 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
}
}
ret = vfio_spapr_create_window(container, section, &pgsize);
if (ret) {
error_setg_errno(errp, -ret, "Failed to create SPAPR window");
ret = vfio_spapr_create_window(container, section, &pgsize, errp);
if (!ret) {
return false;
}