From: BALATON Zoltan <[email protected]> All users were converted so no longer needed.
Signed-off-by: BALATON Zoltan <[email protected]> Reviewed-by: Peter Maydell <[email protected]> Link: https://lore.kernel.org/r/2665c92b578f5f6a602b34c7dde73451773e6148.1772924151.git.bala...@eik.bme.hu Signed-off-by: Peter Xu <[email protected]> --- docs/devel/memory.rst | 1 - .../memory-region-housekeeping.cocci | 28 ------------------- include/system/memory.h | 26 ----------------- system/memory.c | 19 ++----------- 4 files changed, 3 insertions(+), 71 deletions(-) diff --git a/docs/devel/memory.rst b/docs/devel/memory.rst index 8558f70a42..0bb5acab21 100644 --- a/docs/devel/memory.rst +++ b/docs/devel/memory.rst @@ -113,7 +113,6 @@ have a special case where you need to manage the migration of the backing memory yourself, you can call the functions: - memory_region_init_ram_nomigrate() -- memory_region_init_rom_nomigrate() which only initialize the MemoryRegion and leave handling migration to the caller. diff --git a/scripts/coccinelle/memory-region-housekeeping.cocci b/scripts/coccinelle/memory-region-housekeeping.cocci index 7f89e9712e..e45703141a 100644 --- a/scripts/coccinelle/memory-region-housekeeping.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -16,17 +16,10 @@ expression E1, E2, E3, E4, E5; symbol true; @@ -( - memory_region_init_ram(E1, E2, E3, E4, E5); + memory_region_init_rom(E1, E2, E3, E4, E5); ... WHEN != E1 - memory_region_set_readonly(E1, true); -| -- memory_region_init_ram_nomigrate(E1, E2, E3, E4, E5); -+ memory_region_init_rom_nomigrate(E1, E2, E3, E4, E5); - ... WHEN != E1 -- memory_region_set_readonly(E1, true); -) @possible_memory_region_init_rom@ @@ -53,11 +46,7 @@ cocci.print_main("potential use of memory_region_init_rom*() in ", p) expression ROM, E1, E2, E3, E4; expression ALIAS, E5, E6, E7, E8; @@ -( memory_region_init_rom(ROM, E1, E2, E3, E4); -| - memory_region_init_rom_nomigrate(ROM, E1, E2, E3, E4); -) ... memory_region_init_alias(ALIAS, E5, E6, ROM, E7, E8); - memory_region_set_readonly(ALIAS, true); @@ -80,23 +69,6 @@ expression ERRP; ... -vmstate_register_ram_global(MR); @@ -expression MR; -expression NAME; -expression SIZE; -expression ERRP; -@@ --memory_region_init_rom_nomigrate(MR, NULL, NAME, SIZE, ERRP); -+memory_region_init_rom(MR, NULL, NAME, SIZE, ERRP); - ... --vmstate_register_ram_global(MR); -@@ -expression MR; -expression OPS; -expression OPAQUE; -expression NAME; -expression SIZE; -expression ERRP; -@@ typedef DeviceState; identifier device_fn, dev, obj; expression E1, E2, E3, E4, E5; diff --git a/include/system/memory.h b/include/system/memory.h index 0562af3136..7117699b10 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -1588,32 +1588,6 @@ void memory_region_init_alias(MemoryRegion *mr, hwaddr offset, uint64_t size); -/** - * memory_region_init_rom_nomigrate: Initialize a ROM memory region. - * - * This has the same effect as calling memory_region_init_ram_nomigrate() - * and then marking the resulting region read-only with - * memory_region_set_readonly(). - * - * Note that this function does not do anything to cause the data in the - * RAM side of the memory region to be migrated; that is the responsibility - * of the caller. - * - * @mr: the #MemoryRegion to be initialized. - * @owner: the object that tracks the region's reference count - * @name: Region name, becomes part of RAMBlock name used in migration stream - * must be unique within any device - * @size: size of the region. - * @errp: pointer to Error*, to store an error if it happens. - * - * Return: true on success, else false setting @errp with error. - */ -bool memory_region_init_rom_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp); - /** * memory_region_init_iommu: Initialize a memory region of a custom type * that translates addresses diff --git a/system/memory.c b/system/memory.c index c51d0798a8..65042bd9fa 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1738,21 +1738,6 @@ void memory_region_init_alias(MemoryRegion *mr, mr->alias_offset = offset; } -bool memory_region_init_rom_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp) -{ - if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, - size, 0, errp)) { - return false; - } - mr->readonly = true; - - return true; -} - void memory_region_init_iommu(void *_iommu_mr, size_t instance_size, const char *mrtypename, @@ -3757,9 +3742,11 @@ bool memory_region_init_rom(MemoryRegion *mr, { DeviceState *owner_dev; - if (!memory_region_init_rom_nomigrate(mr, owner, name, size, errp)) { + if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, + size, 0, errp)) { return false; } + mr->readonly = true; /* This will assert if owner is neither NULL nor a DeviceState. * We only want the owner here for the purposes of defining a * unique name for migration. TODO: Ideally we should implement -- 2.50.1
