From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL 3/9] HostIOMMUDevice : remove Error handle from get_iova_ranges callback
Date: Tue, 9 Jul 2024 13:50:11 +0200 [thread overview]
Message-ID: <20240709115017.798043-4-clg@redhat.com> (raw)
In-Reply-To: <20240709115017.798043-1-clg@redhat.com>
From: Eric Auger <eric.auger@redhat.com>
The error handle argument is not used anywhere. let's remove it.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
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 ee6c813c8b2299ed1d1d3b34d143c20a8ec27400..05c7324a0d1ccd2e30bc42ca1f0353e55361500a 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 0804c1b8de2af203fd8f7ef91ee12fef105df9b5..ddd835996cfae13dcab01e53fd381ace1cdae668 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -1165,7 +1165,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 890d8d6a38e98138fc14780a76dc8261285f90b5..211e7223f150ee3c8447a9c454c5a3528860682f 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 8fe69ab094f501fced7098f1ba790c26e63aa775..f278417f2bd95bc57832e9d03671e2834fca5f36 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -635,7 +635,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 */
}
--
2.45.2
next prev parent reply other threads:[~2024-07-09 11:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 11:50 [PULL 0/9] vfio queue Cédric Le Goater
2024-07-09 11:50 ` [PULL 1/9] virtio-iommu: Fix error handling in virtio_iommu_set_host_iova_ranges() Cédric Le Goater
2024-07-09 11:50 ` [PULL 2/9] vfio-container-base: Introduce vfio_container_get_iova_ranges() helper Cédric Le Goater
2024-07-09 11:50 ` Cédric Le Goater [this message]
2024-07-09 11:50 ` [PULL 4/9] HostIOMMUDevice: Introduce get_page_size_mask() callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 5/9] virtio-iommu : Retrieve page size mask on virtio_iommu_set_iommu_device() Cédric Le Goater
2024-07-09 11:50 ` [PULL 6/9] memory: remove IOMMU MR iommu_set_page_size_mask() callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 7/9] virtio-iommu: Revert transient enablement of IOMMU MR in bypass mode Cédric Le Goater
2024-07-09 11:50 ` [PULL 8/9] vfio/display: Fix potential memleak of edid info Cédric Le Goater
2024-07-09 11:50 ` [PULL 9/9] vfio/display: Fix vfio_display_edid_init() error path Cédric Le Goater
2024-07-09 17:26 ` [PULL 0/9] vfio queue Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240709115017.798043-4-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhenzhong.duan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).