On Mon, Dec 15, 2025 at 03:51:57PM -0500, Peter Xu wrote: > Rename the function with "_private" suffix, to show that it returns true > only if it has an internal guest-memfd to back private pages (rather than > fully shared guest-memfd). > > Reviewed-by: Xiaoyao Li <[email protected]> > Signed-off-by: Peter Xu <[email protected]>
Reviewed-by: Michael Roth <[email protected]> > --- > include/system/memory.h | 4 ++-- > accel/kvm/kvm-all.c | 6 +++--- > system/memory.c | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/system/memory.h b/include/system/memory.h > index 1f49f9a0ff..9b58303bb8 100644 > --- a/include/system/memory.h > +++ b/include/system/memory.h > @@ -1823,7 +1823,7 @@ static inline bool memory_region_is_romd(MemoryRegion > *mr) > bool memory_region_is_protected(MemoryRegion *mr); > > /** > - * memory_region_has_guest_memfd: check whether a memory region has > + * memory_region_has_guest_memfd_private: check whether a memory region has > * guest_memfd_private associated > * > * Returns %true if a memory region's ram_block has guest_memfd_private > @@ -1831,7 +1831,7 @@ bool memory_region_is_protected(MemoryRegion *mr); > * > * @mr: the memory region being queried > */ > -bool memory_region_has_guest_memfd(MemoryRegion *mr); > +bool memory_region_has_guest_memfd_private(MemoryRegion *mr); > > /** > * memory_region_get_iommu: check whether a memory region is an iommu > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 1126b6f477..0b7ce5a9dd 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -666,7 +666,7 @@ static int kvm_mem_flags(MemoryRegion *mr) > if (readonly && kvm_readonly_mem_allowed) { > flags |= KVM_MEM_READONLY; > } > - if (memory_region_has_guest_memfd(mr)) { > + if (memory_region_has_guest_memfd_private(mr)) { > assert(kvm_guest_memfd_supported); > flags |= KVM_MEM_GUEST_MEMFD; > } > @@ -1615,7 +1615,7 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml, > abort(); > } > > - if (memory_region_has_guest_memfd(mr)) { > + if (memory_region_has_guest_memfd_private(mr)) { > err = kvm_set_memory_attributes_private(start_addr, slot_size); > if (err) { > error_report("%s: failed to set memory attribute private: > %s", > @@ -3101,7 +3101,7 @@ int kvm_convert_memory(hwaddr start, hwaddr size, bool > to_private) > return ret; > } > > - if (!memory_region_has_guest_memfd(mr)) { > + if (!memory_region_has_guest_memfd_private(mr)) { > /* > * Because vMMIO region must be shared, guest TD may convert vMMIO > * region to shared explicitly. Don't complain such case. See > diff --git a/system/memory.c b/system/memory.c > index e8c6d484e6..d70968c966 100644 > --- a/system/memory.c > +++ b/system/memory.c > @@ -1897,7 +1897,7 @@ bool memory_region_is_protected(MemoryRegion *mr) > return mr->ram && (mr->ram_block->flags & RAM_PROTECTED); > } > > -bool memory_region_has_guest_memfd(MemoryRegion *mr) > +bool memory_region_has_guest_memfd_private(MemoryRegion *mr) > { > return mr->ram_block && mr->ram_block->guest_memfd_private >= 0; > } > -- > 2.50.1 > >
