On Mon, Dec 15, 2025 at 03:51:58PM -0500, Peter Xu wrote: > Rename the HostMemoryBackend.guest_memfd field to reflect what it really > means, on whether it needs guest_memfd to back its private portion of > mapping. This will help on clearance when we introduce in-place > guest_memfd for hostmem. > > Signed-off-by: Peter Xu <[email protected]>
Reviewed-by: Michael Roth <[email protected]> > --- > include/system/hostmem.h | 2 +- > backends/hostmem-file.c | 2 +- > backends/hostmem-memfd.c | 2 +- > backends/hostmem-ram.c | 2 +- > backends/hostmem-shm.c | 2 +- > backends/hostmem.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/system/hostmem.h b/include/system/hostmem.h > index 88fa791ac7..dcbf81aeae 100644 > --- a/include/system/hostmem.h > +++ b/include/system/hostmem.h > @@ -76,7 +76,7 @@ struct HostMemoryBackend { > uint64_t size; > bool merge, dump, use_canonical_path; > bool prealloc, is_mapped, share, reserve; > - bool guest_memfd, aligned; > + bool guest_memfd_private, aligned; > uint32_t prealloc_threads; > ThreadContext *prealloc_context; > DECLARE_BITMAP(host_nodes, MAX_NODES + 1); > diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c > index 1f20cd8fd6..0e4cfd6dc6 100644 > --- a/backends/hostmem-file.c > +++ b/backends/hostmem-file.c > @@ -86,7 +86,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error > **errp) > ram_flags |= fb->readonly ? RAM_READONLY_FD : 0; > ram_flags |= fb->rom == ON_OFF_AUTO_ON ? RAM_READONLY : 0; > ram_flags |= backend->reserve ? 0 : RAM_NORESERVE; > - ram_flags |= backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; > + ram_flags |= backend->guest_memfd_private ? RAM_GUEST_MEMFD_PRIVATE : 0; > ram_flags |= fb->is_pmem ? RAM_PMEM : 0; > ram_flags |= RAM_NAMED_FILE; > return memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), > name, > diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c > index 3f3e485709..ea93f034e4 100644 > --- a/backends/hostmem-memfd.c > +++ b/backends/hostmem-memfd.c > @@ -60,7 +60,7 @@ have_fd: > backend->aligned = true; > ram_flags = backend->share ? RAM_SHARED : RAM_PRIVATE; > ram_flags |= backend->reserve ? 0 : RAM_NORESERVE; > - ram_flags |= backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; > + ram_flags |= backend->guest_memfd_private ? RAM_GUEST_MEMFD_PRIVATE : 0; > return memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend), > name, > backend->size, ram_flags, fd, 0, > errp); > } > diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c > index 96ad29112d..6a507fad77 100644 > --- a/backends/hostmem-ram.c > +++ b/backends/hostmem-ram.c > @@ -30,7 +30,7 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error > **errp) > name = host_memory_backend_get_name(backend); > ram_flags = backend->share ? RAM_SHARED : RAM_PRIVATE; > ram_flags |= backend->reserve ? 0 : RAM_NORESERVE; > - ram_flags |= backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; > + ram_flags |= backend->guest_memfd_private ? RAM_GUEST_MEMFD_PRIVATE : 0; > return memory_region_init_ram_flags_nomigrate(&backend->mr, > OBJECT(backend), > name, backend->size, > ram_flags, errp); > diff --git a/backends/hostmem-shm.c b/backends/hostmem-shm.c > index e86fb2e0aa..4766db6aad 100644 > --- a/backends/hostmem-shm.c > +++ b/backends/hostmem-shm.c > @@ -54,7 +54,7 @@ have_fd: > /* Let's do the same as memory-backend-ram,share=on would do. */ > ram_flags = RAM_SHARED; > ram_flags |= backend->reserve ? 0 : RAM_NORESERVE; > - ram_flags |= backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; > + ram_flags |= backend->guest_memfd_private ? RAM_GUEST_MEMFD_PRIVATE : 0; > > return memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend), > backend_name, backend->size, > diff --git a/backends/hostmem.c b/backends/hostmem.c > index 35734d6f4d..70450733db 100644 > --- a/backends/hostmem.c > +++ b/backends/hostmem.c > @@ -288,7 +288,7 @@ static void host_memory_backend_init(Object *obj) > /* TODO: convert access to globals to compat properties */ > backend->merge = machine_mem_merge(machine); > backend->dump = machine_dump_guest_core(machine); > - backend->guest_memfd = machine_require_guest_memfd(machine); > + backend->guest_memfd_private = machine_require_guest_memfd(machine); > backend->reserve = true; > backend->prealloc_threads = machine->smp.cpus; > } > -- > 2.50.1 > >
