Also rename vfio_devices_all_device_dirty_tracking_started() while at it and use the prefix 'vfio_container_devices_' for routines simply looping over the container's device list.
Reviewed-by: Joao Martins <joao.m.mart...@oracle.com> Reviewed-by: John Levon <john.le...@nutanix.com> Reviewed-by: Avihai Horon <avih...@nvidia.com> Link: https://lore.kernel.org/qemu-devel/20250326075122.1299361-30-...@redhat.com Signed-off-by: Cédric Le Goater <c...@redhat.com> --- include/hw/vfio/vfio-container-base.h | 3 ++- hw/vfio/common.c | 2 +- hw/vfio/container-base.c | 6 +++--- hw/vfio/container.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h index 69fb698bc19a693de92d361097413557e3cc2b62..9b33e71f59bba1f3cbe10c307172422ca4e4c2ce 100644 --- a/include/hw/vfio/vfio-container-base.h +++ b/include/hw/vfio/vfio-container-base.h @@ -89,7 +89,8 @@ void vfio_container_del_section_window(VFIOContainerBase *bcontainer, MemoryRegionSection *section); int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, bool start, Error **errp); -bool vfio_devices_all_dirty_tracking_started(const VFIOContainerBase *bcontainer); +bool vfio_container_dirty_tracking_is_started( + const VFIOContainerBase *bcontainer); bool vfio_devices_all_device_dirty_tracking(const VFIOContainerBase *bcontainer); int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, uint64_t size, ram_addr_t ram_addr, Error **errp); diff --git a/hw/vfio/common.c b/hw/vfio/common.c index ed49ef88a865521e16584844721b6ffa09427f18..89b7a71385abfff888c5208a6b4c588b4217716a 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -55,7 +55,7 @@ static bool vfio_log_sync_needed(const VFIOContainerBase *bcontainer) { VFIODevice *vbasedev; - if (!vfio_devices_all_dirty_tracking_started(bcontainer)) { + if (!vfio_container_dirty_tracking_is_started(bcontainer)) { return false; } diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c index 3c8039d52aa1838ca942a7ac29ebbd61fa074e67..1beba37a7739d76630c3e7db16a8d04926cb1aee 100644 --- a/hw/vfio/container-base.c +++ b/hw/vfio/container-base.c @@ -141,7 +141,7 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, return ret; } -static bool vfio_devices_all_device_dirty_tracking_started( +static bool vfio_container_devices_dirty_tracking_is_started( const VFIOContainerBase *bcontainer) { VFIODevice *vbasedev; @@ -155,10 +155,10 @@ static bool vfio_devices_all_device_dirty_tracking_started( return true; } -bool vfio_devices_all_dirty_tracking_started( +bool vfio_container_dirty_tracking_is_started( const VFIOContainerBase *bcontainer) { - return vfio_devices_all_device_dirty_tracking_started(bcontainer) || + return vfio_container_devices_dirty_tracking_is_started(bcontainer) || bcontainer->dirty_pages_started; } diff --git a/hw/vfio/container.c b/hw/vfio/container.c index c55fe8e4bede9d7e228af2472242efb48bc7d037..e8cd9271365e4b2f55fac9ec402c292607f7fc1d 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -137,7 +137,7 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer, int ret; Error *local_err = NULL; - if (iotlb && vfio_devices_all_dirty_tracking_started(bcontainer)) { + if (iotlb && vfio_container_dirty_tracking_is_started(bcontainer)) { if (!vfio_devices_all_device_dirty_tracking(bcontainer) && bcontainer->dirty_pages_supported) { return vfio_dma_unmap_bitmap(container, iova, size, iotlb); -- 2.49.0
