[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCHv3 7/7] vfio: Eliminate vfio_container_ioctl()
From: |
Alex Williamson |
Subject: |
Re: [Qemu-devel] [PATCHv3 7/7] vfio: Eliminate vfio_container_ioctl() |
Date: |
Tue, 8 Mar 2016 11:34:34 -0700 |
On Tue, 8 Mar 2016 13:10:29 +1100
David Gibson <address@hidden> wrote:
> 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 <address@hidden>
> Reviewed-by: Alexey Kardashevskiy <address@hidden>
> ---
Acked-by: Alex Williamson <address@hidden>
> hw/vfio/common.c | 45 ---------------------------------------------
> include/hw/vfio/vfio.h | 2 --
> 2 files changed, 47 deletions(-)
>
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 0636bb1..fb588d8 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -1093,51 +1093,6 @@ int vfio_get_region_info(VFIODevice *vbasedev, int
> index,
> 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)
> */
> diff --git a/include/hw/vfio/vfio.h b/include/hw/vfio/vfio.h
> index fd3933b..7153604 100644
> --- a/include/hw/vfio/vfio.h
> +++ b/include/hw/vfio/vfio.h
> @@ -3,8 +3,6 @@
>
> #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);
> int vfio_eeh_as_op(AddressSpace *as, uint32_t op);
>
- [Qemu-devel] [PATCHv3 0/7] Allow EEH on spapr-pci-host-bridge devices, David Gibson, 2016/03/07
- [Qemu-devel] [PATCHv3 4/7] spapr_pci: Allow EEH on spapr-pci-host-bridge, David Gibson, 2016/03/07
- [Qemu-devel] [PATCHv3 3/7] spapr_pci: Eliminate class callbacks, David Gibson, 2016/03/07
- [Qemu-devel] [PATCHv3 7/7] vfio: Eliminate vfio_container_ioctl(), David Gibson, 2016/03/07
- Re: [Qemu-devel] [PATCHv3 7/7] vfio: Eliminate vfio_container_ioctl(),
Alex Williamson <=
- [Qemu-devel] [PATCHv3 5/7] spapr_pci: (Mostly) remove spapr-pci-vfio-host-bridge, David Gibson, 2016/03/07
- [Qemu-devel] [PATCHv3 6/7] spapr_pci: Remove finish_realize hook, David Gibson, 2016/03/07