Re: [PATCH v2 17/18] system/physmem: Drop 'cpu_' prefix in Physical Memory API

["Cédric Le Goater" <clg@redhat.com>]

On 10/1/25 19:54, Philippe Mathieu-Daudé wrote:
> The functions related to the Physical Memory API declared
> in "system/ram_addr.h" do not operate on vCPU. Remove the
> 'cpu_' prefix.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   include/system/ram_addr.h   | 24 +++++++++----------
>   accel/kvm/kvm-all.c         |  2 +-
>   accel/tcg/cputlb.c          | 12 +++++-----
>   hw/vfio/container-legacy.c  |  8 +++----
>   hw/vfio/container.c         |  4 ++--
>   migration/ram.c             |  4 ++--
>   system/memory.c             |  8 +++----
>   system/physmem.c            | 48 ++++++++++++++++++-------------------
>   target/arm/tcg/mte_helper.c |  2 +-
>   system/memory_ldst.c.inc    |  2 +-
>   tests/tsan/ignore.tsan      |  4 ++--
>   11 files changed, 59 insertions(+), 59 deletions(-)



For vfio,


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

Thanks,

C.


> 
> diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h
> index d2d088bbea6..3894a84fb9c 100644
> --- a/include/system/ram_addr.h
> +++ b/include/system/ram_addr.h
> @@ -136,39 +136,39 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
>   #define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
>   #define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
>   
> -bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
> +bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
>   
> -bool cpu_physical_memory_is_clean(ram_addr_t addr);
> +bool physical_memory_is_clean(ram_addr_t addr);
>   
> -uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
> +uint8_t physical_memory_range_includes_clean(ram_addr_t start,
>                                                    ram_addr_t length,
>                                                    uint8_t mask);
>   
> -void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
> +void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
>   
> -void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
> +void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
>                                            uint8_t mask);
>   
>   /*
> - * Contrary to cpu_physical_memory_sync_dirty_bitmap() this function returns
> + * Contrary to physical_memory_sync_dirty_bitmap() this function returns
>    * the number of dirty pages in @bitmap passed as argument. On the other hand,
> - * cpu_physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
> + * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
>    * weren't set in the global migration bitmap.
>    */
> -uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
> +uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
>                                                   ram_addr_t start,
>                                                   ram_addr_t pages);
>   
> -void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
> +void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
>   
> -bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
> +bool physical_memory_test_and_clear_dirty(ram_addr_t start,
>                                                 ram_addr_t length,
>                                                 unsigned client);
>   
> -DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
> +DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
>       (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client);
>   
> -bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
> +bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
>                                               ram_addr_t start,
>                                               ram_addr_t length);
>   
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 08b2b5a371c..a7ece7db964 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -758,7 +758,7 @@ static void kvm_slot_sync_dirty_pages(KVMSlot *slot)
>       ram_addr_t start = slot->ram_start_offset;
>       ram_addr_t pages = slot->memory_size / qemu_real_host_page_size();
>   
> -    cpu_physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
> +    physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
>   }
>   
>   static void kvm_slot_reset_dirty_pages(KVMSlot *slot)
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index 2a6aa01c57c..a721235dea6 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -858,7 +858,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
>      can be detected */
>   void tlb_protect_code(ram_addr_t ram_addr)
>   {
> -    cpu_physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK,
> +    physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK,
>                                                TARGET_PAGE_SIZE,
>                                                DIRTY_MEMORY_CODE);
>   }
> @@ -867,7 +867,7 @@ void tlb_protect_code(ram_addr_t ram_addr)
>      tested for self modifying code */
>   void tlb_unprotect_code(ram_addr_t ram_addr)
>   {
> -    cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE);
> +    physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE);
>   }
>   
>   
> @@ -1085,7 +1085,7 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx,
>           if (prot & PAGE_WRITE) {
>               if (section->readonly) {
>                   write_flags |= TLB_DISCARD_WRITE;
> -            } else if (cpu_physical_memory_is_clean(iotlb)) {
> +            } else if (physical_memory_is_clean(iotlb)) {
>                   write_flags |= TLB_NOTDIRTY;
>               }
>           }
> @@ -1341,7 +1341,7 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
>   
>       trace_memory_notdirty_write_access(mem_vaddr, ram_addr, size);
>   
> -    if (!cpu_physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) {
> +    if (!physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) {
>           tb_invalidate_phys_range_fast(cpu, ram_addr, size, retaddr);
>       }
>   
> @@ -1349,10 +1349,10 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
>        * Set both VGA and migration bits for simplicity and to remove
>        * the notdirty callback faster.
>        */
> -    cpu_physical_memory_set_dirty_range(ram_addr, size, DIRTY_CLIENTS_NOCODE);
> +    physical_memory_set_dirty_range(ram_addr, size, DIRTY_CLIENTS_NOCODE);
>   
>       /* We remove the notdirty callback only if the code has been flushed. */
> -    if (!cpu_physical_memory_is_clean(ram_addr)) {
> +    if (!physical_memory_is_clean(ram_addr)) {
>           trace_memory_notdirty_set_dirty(mem_vaddr);
>           tlb_set_dirty(cpu, mem_vaddr);
>       }
> diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c
> index 3a710d8265c..eb9911eaeaf 100644
> --- a/hw/vfio/container-legacy.c
> +++ b/hw/vfio/container-legacy.c
> @@ -92,7 +92,7 @@ static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container,
>       bitmap = (struct vfio_bitmap *)&unmap->data;
>   
>       /*
> -     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
> +     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
>        * qemu_real_host_page_size to mark those dirty. Hence set bitmap_pgsize
>        * to qemu_real_host_page_size.
>        */
> @@ -108,7 +108,7 @@ static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container,
>   
>       ret = ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, unmap);
>       if (!ret) {
> -        cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap,
> +        physical_memory_set_dirty_lebitmap(vbmap.bitmap,
>                   iotlb->translated_addr, vbmap.pages);
>       } else {
>           error_report("VFIO_UNMAP_DMA with DIRTY_BITMAP : %m");
> @@ -284,7 +284,7 @@ static int vfio_legacy_query_dirty_bitmap(const VFIOContainer *bcontainer,
>       range->size = size;
>   
>       /*
> -     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
> +     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
>        * qemu_real_host_page_size to mark those dirty. Hence set bitmap's pgsize
>        * to qemu_real_host_page_size.
>        */
> @@ -503,7 +503,7 @@ static void vfio_get_iommu_info_migration(VFIOLegacyContainer *container,
>                               header);
>   
>       /*
> -     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
> +     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
>        * qemu_real_host_page_size to mark those dirty.
>        */
>       if (cap_mig->pgsize_bitmap & qemu_real_host_page_size()) {
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 41de3439246..3fb19a1c8ad 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -255,7 +255,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
>       int ret;
>   
>       if (!bcontainer->dirty_pages_supported && !all_device_dirty_tracking) {
> -        cpu_physical_memory_set_dirty_range(translated_addr, size,
> +        physical_memory_set_dirty_range(translated_addr, size,
>                                               tcg_enabled() ? DIRTY_CLIENTS_ALL :
>                                               DIRTY_CLIENTS_NOCODE);
>           return 0;
> @@ -280,7 +280,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
>           goto out;
>       }
>   
> -    dirty_pages = cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap,
> +    dirty_pages = physical_memory_set_dirty_lebitmap(vbmap.bitmap,
>                                                            translated_addr,
>                                                            vbmap.pages);
>   
> diff --git a/migration/ram.c b/migration/ram.c
> index 52bdfec91d9..d09591c0600 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -976,7 +976,7 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb,
>               }
>           }
>           if (num_dirty) {
> -            cpu_physical_memory_dirty_bits_cleared(start, length);
> +            physical_memory_dirty_bits_cleared(start, length);
>           }
>   
>           if (rb->clear_bmap) {
> @@ -995,7 +995,7 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb,
>           ram_addr_t offset = rb->offset;
>   
>           for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) {
> -            if (cpu_physical_memory_test_and_clear_dirty(
> +            if (physical_memory_test_and_clear_dirty(
>                           start + addr + offset,
>                           TARGET_PAGE_SIZE,
>                           DIRTY_MEMORY_MIGRATION)) {
> diff --git a/system/memory.c b/system/memory.c
> index cf8cad69611..dd045da60c0 100644
> --- a/system/memory.c
> +++ b/system/memory.c
> @@ -2275,7 +2275,7 @@ void memory_region_set_dirty(MemoryRegion *mr, hwaddr addr,
>                                hwaddr size)
>   {
>       assert(mr->ram_block);
> -    cpu_physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
> +    physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
>                                           size,
>                                           memory_region_get_dirty_log_mask(mr));
>   }
> @@ -2379,7 +2379,7 @@ DirtyBitmapSnapshot *memory_region_snapshot_and_clear_dirty(MemoryRegion *mr,
>       DirtyBitmapSnapshot *snapshot;
>       assert(mr->ram_block);
>       memory_region_sync_dirty_bitmap(mr, false);
> -    snapshot = cpu_physical_memory_snapshot_and_clear_dirty(mr, addr, size, client);
> +    snapshot = physical_memory_snapshot_and_clear_dirty(mr, addr, size, client);
>       memory_global_after_dirty_log_sync();
>       return snapshot;
>   }
> @@ -2388,7 +2388,7 @@ bool memory_region_snapshot_get_dirty(MemoryRegion *mr, DirtyBitmapSnapshot *sna
>                                         hwaddr addr, hwaddr size)
>   {
>       assert(mr->ram_block);
> -    return cpu_physical_memory_snapshot_get_dirty(snap,
> +    return physical_memory_snapshot_get_dirty(snap,
>                   memory_region_get_ram_addr(mr) + addr, size);
>   }
>   
> @@ -2426,7 +2426,7 @@ void memory_region_reset_dirty(MemoryRegion *mr, hwaddr addr,
>                                  hwaddr size, unsigned client)
>   {
>       assert(mr->ram_block);
> -    cpu_physical_memory_test_and_clear_dirty(
> +    physical_memory_test_and_clear_dirty(
>           memory_region_get_ram_addr(mr) + addr, size, client);
>   }
>   
> diff --git a/system/physmem.c b/system/physmem.c
> index ad9705c7726..1a075da2bdd 100644
> --- a/system/physmem.c
> +++ b/system/physmem.c
> @@ -901,7 +901,7 @@ void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length)
>       }
>   }
>   
> -void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length)
> +void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length)
>   {
>       if (tcg_enabled()) {
>           tlb_reset_dirty_range_all(start, length);
> @@ -947,17 +947,17 @@ static bool physical_memory_get_dirty(ram_addr_t start, ram_addr_t length,
>       return dirty;
>   }
>   
> -bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client)
> +bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client)
>   {
>       return physical_memory_get_dirty(addr, 1, client);
>   }
>   
> -bool cpu_physical_memory_is_clean(ram_addr_t addr)
> +bool physical_memory_is_clean(ram_addr_t addr)
>   {
> -    bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
> -    bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
> +    bool vga = physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
> +    bool code = physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
>       bool migration =
> -        cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
> +        physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
>       return !(vga && code && migration);
>   }
>   
> @@ -1000,7 +1000,7 @@ static bool physical_memory_all_dirty(ram_addr_t start, ram_addr_t length,
>       return dirty;
>   }
>   
> -uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
> +uint8_t physical_memory_range_includes_clean(ram_addr_t start,
>                                                    ram_addr_t length,
>                                                    uint8_t mask)
>   {
> @@ -1021,7 +1021,7 @@ uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
>       return ret;
>   }
>   
> -void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client)
> +void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client)
>   {
>       unsigned long page, idx, offset;
>       DirtyMemoryBlocks *blocks;
> @@ -1039,7 +1039,7 @@ void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client)
>       set_bit_atomic(offset, blocks->blocks[idx]);
>   }
>   
> -void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
> +void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
>                                            uint8_t mask)
>   {
>       DirtyMemoryBlocks *blocks[DIRTY_MEMORY_NUM];
> @@ -1091,7 +1091,7 @@ void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
>   }
>   
>   /* Note: start and end must be within the same ram block.  */
> -bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
> +bool physical_memory_test_and_clear_dirty(ram_addr_t start,
>                                                 ram_addr_t length,
>                                                 unsigned client)
>   {
> @@ -1133,7 +1133,7 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
>       }
>   
>       if (dirty) {
> -        cpu_physical_memory_dirty_bits_cleared(start, length);
> +        physical_memory_dirty_bits_cleared(start, length);
>       }
>   
>       return dirty;
> @@ -1141,12 +1141,12 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
>   
>   static void physical_memory_clear_dirty_range(ram_addr_t addr, ram_addr_t length)
>   {
> -    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_MIGRATION);
> -    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_VGA);
> -    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_CODE);
> +    physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_MIGRATION);
> +    physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_VGA);
> +    physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_CODE);
>   }
>   
> -DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
> +DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
>       (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client)
>   {
>       DirtyMemoryBlocks *blocks;
> @@ -1193,14 +1193,14 @@ DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
>           }
>       }
>   
> -    cpu_physical_memory_dirty_bits_cleared(start, length);
> +    physical_memory_dirty_bits_cleared(start, length);
>   
>       memory_region_clear_dirty_bitmap(mr, offset, length);
>   
>       return snap;
>   }
>   
> -bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
> +bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
>                                               ram_addr_t start,
>                                               ram_addr_t length)
>   {
> @@ -1221,7 +1221,7 @@ bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
>       return false;
>   }
>   
> -uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
> +uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
>                                                   ram_addr_t start,
>                                                   ram_addr_t pages)
>   {
> @@ -1314,7 +1314,7 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
>                       page_number = (i * HOST_LONG_BITS + j) * hpratio;
>                       addr = page_number * TARGET_PAGE_SIZE;
>                       ram_addr = start + addr;
> -                    cpu_physical_memory_set_dirty_range(ram_addr,
> +                    physical_memory_set_dirty_range(ram_addr,
>                                          TARGET_PAGE_SIZE * hpratio, clients);
>                   } while (c != 0);
>               }
> @@ -2082,7 +2082,7 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
>   
>       physical_memory_clear_dirty_range(block->offset, block->used_length);
>       block->used_length = newsize;
> -    cpu_physical_memory_set_dirty_range(block->offset, block->used_length,
> +    physical_memory_set_dirty_range(block->offset, block->used_length,
>                                           DIRTY_CLIENTS_ALL);
>       memory_region_set_size(block->mr, unaligned_size);
>       if (block->resized) {
> @@ -2287,7 +2287,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
>       ram_list.version++;
>       qemu_mutex_unlock_ramlist();
>   
> -    cpu_physical_memory_set_dirty_range(new_block->offset,
> +    physical_memory_set_dirty_range(new_block->offset,
>                                           new_block->used_length,
>                                           DIRTY_CLIENTS_ALL);
>   
> @@ -3136,19 +3136,19 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr,
>       addr += ramaddr;
>   
>       /* No early return if dirty_log_mask is or becomes 0, because
> -     * cpu_physical_memory_set_dirty_range will still call
> +     * physical_memory_set_dirty_range will still call
>        * xen_modified_memory.
>        */
>       if (dirty_log_mask) {
>           dirty_log_mask =
> -            cpu_physical_memory_range_includes_clean(addr, length, dirty_log_mask);
> +            physical_memory_range_includes_clean(addr, length, dirty_log_mask);
>       }
>       if (dirty_log_mask & (1 << DIRTY_MEMORY_CODE)) {
>           assert(tcg_enabled());
>           tb_invalidate_phys_range(NULL, addr, addr + length - 1);
>           dirty_log_mask &= ~(1 << DIRTY_MEMORY_CODE);
>       }
> -    cpu_physical_memory_set_dirty_range(addr, length, dirty_log_mask);
> +    physical_memory_set_dirty_range(addr, length, dirty_log_mask);
>   }
>   
>   void memory_region_flush_rom_device(MemoryRegion *mr, hwaddr addr, hwaddr size)
> diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c
> index 7d80244788e..077ff4b2b2c 100644
> --- a/target/arm/tcg/mte_helper.c
> +++ b/target/arm/tcg/mte_helper.c
> @@ -189,7 +189,7 @@ uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx,
>        */
>       if (tag_access == MMU_DATA_STORE) {
>           ram_addr_t tag_ra = memory_region_get_ram_addr(mr) + xlat;
> -        cpu_physical_memory_set_dirty_flag(tag_ra, DIRTY_MEMORY_MIGRATION);
> +        physical_memory_set_dirty_flag(tag_ra, DIRTY_MEMORY_MIGRATION);
>       }
>   
>       return memory_region_get_ram_ptr(mr) + xlat;
> diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
> index 7f32d3d9ff3..333da209d1a 100644
> --- a/system/memory_ldst.c.inc
> +++ b/system/memory_ldst.c.inc
> @@ -287,7 +287,7 @@ void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL,
>   
>           dirty_log_mask = memory_region_get_dirty_log_mask(mr);
>           dirty_log_mask &= ~(1 << DIRTY_MEMORY_CODE);
> -        cpu_physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
> +        physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
>                                               4, dirty_log_mask);
>           r = MEMTX_OK;
>       }
> diff --git a/tests/tsan/ignore.tsan b/tests/tsan/ignore.tsan
> index 423e482d2f9..8fa00a2c49b 100644
> --- a/tests/tsan/ignore.tsan
> +++ b/tests/tsan/ignore.tsan
> @@ -4,7 +4,7 @@
>   # The eventual goal would be to fix these warnings.
>   
>   # TSan is not happy about setting/getting of dirty bits,
> -# for example, cpu_physical_memory_set_dirty_range,
> -# and cpu_physical_memory_get_dirty.
> +# for example, physical_memory_set_dirty_range,
> +# and physical_memory_get_dirty.
>   src:bitops.c
>   src:bitmap.c