[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/16] vfio: Eliminate vfio_container_ioctl()
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 16/16] vfio: Eliminate vfio_container_ioctl() |
Date: |
Wed, 16 Mar 2016 16:07:08 +1100 |
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);
--
2.5.0
- [Qemu-devel] [PULL 00/16] ppc-for-2.6 queue 20160316, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 02/16] ppc: Fix migration of the TAR SPR, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 11/16] spapr_pci: Switch to vfio_eeh_as_op() interface, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 03/16] ppc: Add a few more P8 PMU SPRs, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 09/16] spapr_rng: fix race with main loop, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 15/16] spapr_pci: Remove finish_realize hook, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 07/16] target-ppc: Add helpers for updating a CPU's SDR1 and external HPT, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 16/16] vfio: Eliminate vfio_container_ioctl(),
David Gibson <=
- [Qemu-devel] [PULL 14/16] spapr_pci: (Mostly) remove spapr-pci-vfio-host-bridge, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 08/16] target-ppc: Eliminate kvmppc_kern_htab global, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 12/16] spapr_pci: Eliminate class callbacks, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 06/16] target-ppc: Split out SREGS get/put functions, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 01/16] ppc: Define the PSPB register on POWER8, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 10/16] vfio: Start improving VFIO/EEH interface, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 13/16] spapr_pci: Allow EEH on spapr-pci-host-bridge, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 04/16] target-ppc: Add PVR for POWER8NVL processor, David Gibson, 2016/03/16
- [Qemu-devel] [PULL 05/16] spapr_pci: fix multifunction hotplug, David Gibson, 2016/03/16
- Re: [Qemu-devel] [PULL 00/16] ppc-for-2.6 queue 20160316, Peter Maydell, 2016/03/16