Re: [PATCH 3/7] HostIOMMUDevice : remove Error handle from get_iova_ranges callback

[Cédric Le Goater]

On 6/26/24 10:26 AM, Eric Auger wrote:

The error handle argument is not used anywhere. let's remove it.

Signed-off-by: Eric Auger <eric.au...@redhat.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  include/sysemu/host_iommu_device.h | 3 +--
  hw/vfio/container.c                | 2 +-
  hw/vfio/iommufd.c                  | 2 +-
  hw/virtio/virtio-iommu.c           | 2 +-
  4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/sysemu/host_iommu_device.h 
b/include/sysemu/host_iommu_device.h
index ee6c813c8b..05c7324a0d 100644
--- a/include/sysemu/host_iommu_device.h
+++ b/include/sysemu/host_iommu_device.h
@@ -87,9 +87,8 @@ struct HostIOMMUDeviceClass {
       * @hiod Host IOMMU device
       *
       * @hiod: handle to the host IOMMU device
-     * @errp: error handle
       */
-    GList* (*get_iova_ranges)(HostIOMMUDevice *hiod, Error **errp);
+    GList* (*get_iova_ranges)(HostIOMMUDevice *hiod);
  };

/*

diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 2ad57cd845..adeab1ac89 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -1166,7 +1166,7 @@ static int hiod_legacy_vfio_get_cap(HostIOMMUDevice 
*hiod, int cap,
  }

static GList *

-hiod_legacy_vfio_get_iova_ranges(HostIOMMUDevice *hiod, Error **errp)
+hiod_legacy_vfio_get_iova_ranges(HostIOMMUDevice *hiod)
  {
      VFIODevice *vdev = hiod->agent;

diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c

index 890d8d6a38..211e7223f1 100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -644,7 +644,7 @@ static bool hiod_iommufd_vfio_realize(HostIOMMUDevice 
*hiod, void *opaque,
  }

static GList *

-hiod_iommufd_vfio_get_iova_ranges(HostIOMMUDevice *hiod, Error **errp)
+hiod_iommufd_vfio_get_iova_ranges(HostIOMMUDevice *hiod)
  {
      VFIODevice *vdev = hiod->agent;

diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c

index b708fb96fd..b8f75d2b1a 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -615,7 +615,7 @@ static bool virtio_iommu_set_iommu_device(PCIBus *bus, void 
*opaque, int devfn,

if (hiodc->get_iova_ranges) {

          int ret;
-        host_iova_ranges = hiodc->get_iova_ranges(hiod, errp);
+        host_iova_ranges = hiodc->get_iova_ranges(hiod);
          if (!host_iova_ranges) {
              return true; /* some old kernels may not support that capability 
*/
          }