Re: [PATCH V1 03/26] vfio: vfio_find_ram_discard_listener

[Cédric Le Goater]

On 1/29/25 15:42, Steve Sistare wrote:

Define vfio_find_ram_discard_listener as a subroutine so additional calls to
it may be added in a subsequent patch.

Signed-off-by: Steve Sistare 



Reviewed-by: Cédric Le Goater 

Thanks,

C.



---
  hw/vfio/common.c | 35 ++-
  1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index f7499a9..7370332 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -555,6 +555,26 @@ static bool vfio_get_section_iova_range(VFIOContainerBase 
*bcontainer,
  return true;
  }
  
+static VFIORamDiscardListener *vfio_find_ram_discard_listener(

+VFIOContainerBase *bcontainer, MemoryRegionSection *section)
+{
+VFIORamDiscardListener *vrdl = NULL;
+
+QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) {
+if (vrdl->mr == section->mr &&
+vrdl->offset_within_address_space ==
+section->offset_within_address_space) {
+break;
+}
+}
+
+if (!vrdl) {
+hw_error("vfio: Trying to sync missing RAM discard listener");
+/* does not return */
+}
+return vrdl;
+}
+
  static void vfio_listener_region_add(MemoryListener *listener,
   MemoryRegionSection *section)
  {
@@ -1266,19 +1286,8 @@ 
vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainerBase *bcontainer,
  MemoryRegionSection *section)
  {
  RamDiscardManager *rdm = 
memory_region_get_ram_discard_manager(section->mr);
-VFIORamDiscardListener *vrdl = NULL;
-
-QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) {
-if (vrdl->mr == section->mr &&
-vrdl->offset_within_address_space ==
-section->offset_within_address_space) {
-break;
-}
-}
-
-if (!vrdl) {
-hw_error("vfio: Trying to sync missing RAM discard listener");
-}
+VFIORamDiscardListener *vrdl =
+vfio_find_ram_discard_listener(bcontainer, section);
  
  /*

   * We only want/can synchronize the bitmap for actually mapped parts -

[PATCH V1 03/26] vfio: vfio_find_ram_discard_listener

[Steve Sistare]

Define vfio_find_ram_discard_listener as a subroutine so additional calls to
it may be added in a subsequent patch.

Signed-off-by: Steve Sistare 
---
 hw/vfio/common.c | 35 ++-
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index f7499a9..7370332 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -555,6 +555,26 @@ static bool vfio_get_section_iova_range(VFIOContainerBase 
*bcontainer,
 return true;
 }
 
+static VFIORamDiscardListener *vfio_find_ram_discard_listener(
+VFIOContainerBase *bcontainer, MemoryRegionSection *section)
+{
+VFIORamDiscardListener *vrdl = NULL;
+
+QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) {
+if (vrdl->mr == section->mr &&
+vrdl->offset_within_address_space ==
+section->offset_within_address_space) {
+break;
+}
+}
+
+if (!vrdl) {
+hw_error("vfio: Trying to sync missing RAM discard listener");
+/* does not return */
+}
+return vrdl;
+}
+
 static void vfio_listener_region_add(MemoryListener *listener,
  MemoryRegionSection *section)
 {
@@ -1266,19 +1286,8 @@ 
vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainerBase *bcontainer,
 MemoryRegionSection *section)
 {
 RamDiscardManager *rdm = 
memory_region_get_ram_discard_manager(section->mr);
-VFIORamDiscardListener *vrdl = NULL;
-
-QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) {
-if (vrdl->mr == section->mr &&
-vrdl->offset_within_address_space ==
-section->offset_within_address_space) {
-break;
-}
-}
-
-if (!vrdl) {
-hw_error("vfio: Trying to sync missing RAM discard listener");
-}
+VFIORamDiscardListener *vrdl =
+vfio_find_ram_discard_listener(bcontainer, section);
 
 /*
  * We only want/can synchronize the bitmap for actually mapped parts -
-- 
1.8.3.1