On Mon, Dec 15, 2025 at 03:52:01PM -0500, Peter Xu wrote: > Differenciate it from fully shared guest-memfd use cases. > > Suggested-by: Xiaoyao Li <[email protected]> > Signed-off-by: Peter Xu <[email protected]>
Reviewed-by: Michael Roth <[email protected]> > --- > include/system/memory.h | 10 +++++----- > backends/igvm.c | 4 ++-- > hw/i386/pc.c | 4 ++-- > hw/i386/pc_sysfw.c | 4 ++-- > hw/i386/x86-common.c | 4 ++-- > system/memory.c | 10 +++++----- > 6 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/include/system/memory.h b/include/system/memory.h > index 9b58303bb8..b3d000a563 100644 > --- a/include/system/memory.h > +++ b/include/system/memory.h > @@ -1693,11 +1693,11 @@ bool memory_region_init_ram(MemoryRegion *mr, > uint64_t size, > Error **errp); > > -bool memory_region_init_ram_guest_memfd(MemoryRegion *mr, > - Object *owner, > - const char *name, > - uint64_t size, > - Error **errp); > +bool memory_region_init_ram_guest_memfd_private(MemoryRegion *mr, > + Object *owner, > + const char *name, > + uint64_t size, > + Error **errp); > > /** > * memory_region_init_rom: Initialize a ROM memory region. > diff --git a/backends/igvm.c b/backends/igvm.c > index 905bd8d989..91631829e5 100644 > --- a/backends/igvm.c > +++ b/backends/igvm.c > @@ -221,8 +221,8 @@ static void *qigvm_prepare_memory(QIgvm *ctx, uint64_t > addr, uint64_t size, > g_strdup_printf("igvm.%X", region_identifier); > igvm_pages = g_new0(MemoryRegion, 1); > if (ctx->cgs && ctx->cgs->require_guest_memfd) { > - if (!memory_region_init_ram_guest_memfd(igvm_pages, NULL, > - region_name, size, > errp)) { > + if (!memory_region_init_ram_guest_memfd_private( > + igvm_pages, NULL, region_name, size, errp)) { > return NULL; > } > } else { > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index b2d55ceb5e..41dfbbdcf0 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -963,8 +963,8 @@ void pc_memory_init(PCMachineState *pcms, > if (!is_tdx_vm()) { > option_rom_mr = g_malloc(sizeof(*option_rom_mr)); > if (machine_require_guest_memfd_private(machine)) { > - memory_region_init_ram_guest_memfd(option_rom_mr, NULL, "pc.rom", > - PC_ROM_SIZE, &error_fatal); > + memory_region_init_ram_guest_memfd_private( > + option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE, &error_fatal); > } else { > memory_region_init_ram(option_rom_mr, NULL, "pc.rom", > PC_ROM_SIZE, > &error_fatal); > diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c > index 1c37258654..ad55d4eba6 100644 > --- a/hw/i386/pc_sysfw.c > +++ b/hw/i386/pc_sysfw.c > @@ -53,8 +53,8 @@ static void pc_isa_bios_init(PCMachineState *pcms, > MemoryRegion *isa_bios, > /* map the last 128KB of the BIOS in ISA space */ > isa_bios_size = MIN(flash_size, 128 * KiB); > if (machine_require_guest_memfd_private(MACHINE(pcms))) { > - memory_region_init_ram_guest_memfd(isa_bios, NULL, "isa-bios", > - isa_bios_size, &error_fatal); > + memory_region_init_ram_guest_memfd_private( > + isa_bios, NULL, "isa-bios", isa_bios_size, &error_fatal); > } else { > memory_region_init_ram(isa_bios, NULL, "isa-bios", isa_bios_size, > &error_fatal); > diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c > index 33ac7fb6e9..27854a9164 100644 > --- a/hw/i386/x86-common.c > +++ b/hw/i386/x86-common.c > @@ -1045,8 +1045,8 @@ void x86_bios_rom_init(X86MachineState *x86ms, const > char *default_firmware, > goto bios_error; > } > if (machine_require_guest_memfd_private(MACHINE(x86ms))) { > - memory_region_init_ram_guest_memfd(&x86ms->bios, NULL, "pc.bios", > - bios_size, &error_fatal); > + memory_region_init_ram_guest_memfd_private( > + &x86ms->bios, NULL, "pc.bios", bios_size, &error_fatal); > if (is_tdx_vm()) { > tdx_set_tdvf_region(&x86ms->bios); > } > diff --git a/system/memory.c b/system/memory.c > index d70968c966..28810dcb29 100644 > --- a/system/memory.c > +++ b/system/memory.c > @@ -3746,11 +3746,11 @@ bool memory_region_init_ram(MemoryRegion *mr, > return true; > } > > -bool memory_region_init_ram_guest_memfd(MemoryRegion *mr, > - Object *owner, > - const char *name, > - uint64_t size, > - Error **errp) > +bool memory_region_init_ram_guest_memfd_private(MemoryRegion *mr, > + Object *owner, > + const char *name, > + uint64_t size, > + Error **errp) > { > DeviceState *owner_dev; > > -- > 2.50.1 > >
