mirror of https://github.com/xqemu/xqemu.git
vfio: Eliminate vfio_container_ioctl()
vfio_container_ioctl() was a bad interface that bypassed abstraction boundaries, had semantics that sat uneasily with its name, and was unsafe in many realistic circumstances. Now that spapr-pci-vfio-host-bridge has been folded into spapr-pci-host-bridge, there are no more users, so remove it. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> Acked-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
parent
a36304fdca
commit
3356128cd1
|
@ -1093,51 +1093,6 @@ int vfio_get_region_info(VFIODevice *vbasedev, int index,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vfio_container_do_ioctl(AddressSpace *as, int32_t groupid,
|
|
||||||
int req, void *param)
|
|
||||||
{
|
|
||||||
VFIOGroup *group;
|
|
||||||
VFIOContainer *container;
|
|
||||||
int ret = -1;
|
|
||||||
|
|
||||||
group = vfio_get_group(groupid, as);
|
|
||||||
if (!group) {
|
|
||||||
error_report("vfio: group %d not registered", groupid);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
container = group->container;
|
|
||||||
if (group->container) {
|
|
||||||
ret = ioctl(container->fd, req, param);
|
|
||||||
if (ret < 0) {
|
|
||||||
error_report("vfio: failed to ioctl %d to container: ret=%d, %s",
|
|
||||||
_IOC_NR(req) - VFIO_BASE, ret, strerror(errno));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
vfio_put_group(group);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int vfio_container_ioctl(AddressSpace *as, int32_t groupid,
|
|
||||||
int req, void *param)
|
|
||||||
{
|
|
||||||
/* We allow only certain ioctls to the container */
|
|
||||||
switch (req) {
|
|
||||||
case VFIO_CHECK_EXTENSION:
|
|
||||||
case VFIO_IOMMU_SPAPR_TCE_GET_INFO:
|
|
||||||
case VFIO_EEH_PE_OP:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
/* Return an error on unknown requests */
|
|
||||||
error_report("vfio: unsupported ioctl %X", req);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return vfio_container_do_ioctl(as, groupid, req, param);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Interfaces for IBM EEH (Enhanced Error Handling)
|
* Interfaces for IBM EEH (Enhanced Error Handling)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
|
|
||||||
#include "qemu/typedefs.h"
|
#include "qemu/typedefs.h"
|
||||||
|
|
||||||
extern int vfio_container_ioctl(AddressSpace *as, int32_t groupid,
|
|
||||||
int req, void *param);
|
|
||||||
bool vfio_eeh_as_ok(AddressSpace *as);
|
bool vfio_eeh_as_ok(AddressSpace *as);
|
||||||
int vfio_eeh_as_op(AddressSpace *as, uint32_t op);
|
int vfio_eeh_as_op(AddressSpace *as, uint32_t op);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue