memory: Remove memory_region_init_rom_nomigrate()
All users were converted so no longer needed. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Link: https://lore.kernel.org/r/2665c92b578f5f6a602b34c7dde73451773e6148.1772924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu <peterx@redhat.com>
BALATON Zoltan committed
Mar 8, 2026 at 00:06 UTC
0f3294051023623f8e495ebd358e32330d40b8df
4 files changed
+3
-71
docs/devel/memory.rst
-1
@@ -113,7 +113,6 @@ have a special case where you need to manage the migration of
113
the backing memory yourself, you can call the functions:
114
115
- memory_region_init_ram_nomigrate()
116
-- memory_region_init_rom_nomigrate()
116
117
which only initialize the MemoryRegion and leave handling
118
migration to the caller.
include/system/memory.h
-26
@@ -1588,32 +1588,6 @@ void memory_region_init_alias(MemoryRegion *mr,
1588
hwaddr offset,
1589
uint64_t size);
1590
1591
-/**
1592
- * memory_region_init_rom_nomigrate: Initialize a ROM memory region.
1593
- *
1594
- * This has the same effect as calling memory_region_init_ram_nomigrate()
1595
- * and then marking the resulting region read-only with
1596
- * memory_region_set_readonly().
1597
- *
1598
- * Note that this function does not do anything to cause the data in the
1599
- * RAM side of the memory region to be migrated; that is the responsibility
1600
- * of the caller.
1601
- *
1602
- * @mr: the #MemoryRegion to be initialized.
1603
- * @owner: the object that tracks the region's reference count
1604
- * @name: Region name, becomes part of RAMBlock name used in migration stream
1605
- * must be unique within any device
1606
- * @size: size of the region.
1607
- * @errp: pointer to Error*, to store an error if it happens.
1608
- *
1609
- * Return: true on success, else false setting @errp with error.
1610
- */
1611
-bool memory_region_init_rom_nomigrate(MemoryRegion *mr,
1612
- Object *owner,
1613
- const char *name,
1614
- uint64_t size,
1615
- Error **errp);
1616
-
1591
/**
1592
* memory_region_init_iommu: Initialize a memory region of a custom type
1593
* that translates addresses
scripts/coccinelle/memory-region-housekeeping.cocci
-28
@@ -16,17 +16,10 @@
16
expression E1, E2, E3, E4, E5;
17
symbol true;
18
@@
19
-(
19
- memory_region_init_ram(E1, E2, E3, E4, E5);
20
+ memory_region_init_rom(E1, E2, E3, E4, E5);
21
... WHEN != E1
22
- memory_region_set_readonly(E1, true);
24
-|
25
-- memory_region_init_ram_nomigrate(E1, E2, E3, E4, E5);
26
-+ memory_region_init_rom_nomigrate(E1, E2, E3, E4, E5);
27
- ... WHEN != E1
28
-- memory_region_set_readonly(E1, true);
29
-)
23
24
25
@possible_memory_region_init_rom@
@@ -53,11 +46,7 @@ cocci.print_main("potential use of memory_region_init_rom*() in ", p)
46
expression ROM, E1, E2, E3, E4;
47
expression ALIAS, E5, E6, E7, E8;
48
@@
56
-(
49
memory_region_init_rom(ROM, E1, E2, E3, E4);
58
-|
59
- memory_region_init_rom_nomigrate(ROM, E1, E2, E3, E4);
60
-)
50
...
51
memory_region_init_alias(ALIAS, E5, E6, ROM, E7, E8);
52
- memory_region_set_readonly(ALIAS, true);
@@ -80,23 +69,6 @@ expression ERRP;
69
...
70
-vmstate_register_ram_global(MR);
71
@@
83
-expression MR;
84
-expression NAME;
85
-expression SIZE;
86
-expression ERRP;
87
-@@
88
--memory_region_init_rom_nomigrate(MR, NULL, NAME, SIZE, ERRP);
89
-+memory_region_init_rom(MR, NULL, NAME, SIZE, ERRP);
90
- ...
91
--vmstate_register_ram_global(MR);
92
-@@
93
-expression MR;
94
-expression OPS;
95
-expression OPAQUE;
96
-expression NAME;
97
-expression SIZE;
98
-expression ERRP;
99
-@@
72
typedef DeviceState;
73
identifier device_fn, dev, obj;
74
expression E1, E2, E3, E4, E5;
system/memory.c
+3
-16
@@ -1738,21 +1738,6 @@ void memory_region_init_alias(MemoryRegion *mr,
1738
mr->alias_offset = offset;
1739
}
1740
1741
-bool memory_region_init_rom_nomigrate(MemoryRegion *mr,
1742
- Object *owner,
1743
- const char *name,
1744
- uint64_t size,
1745
- Error **errp)
1746
-{
1747
- if (!memory_region_init_ram_flags_nomigrate(mr, owner, name,
1748
- size, 0, errp)) {
1749
- return false;
1750
- }
1751
- mr->readonly = true;
1752
-
1753
- return true;
1754
-}
1755
-
1741
void memory_region_init_iommu(void *_iommu_mr,
1742
size_t instance_size,
1743
const char *mrtypename,
@@ -3757,9 +3742,11 @@ bool memory_region_init_rom(MemoryRegion *mr,
3742
{
3743
DeviceState *owner_dev;
3744
3760
- if (!memory_region_init_rom_nomigrate(mr, owner, name, size, errp)) {
3745
+ if (!memory_region_init_ram_flags_nomigrate(mr, owner, name,
3746
+ size, 0, errp)) {
3747
return false;
3748
}
3749
+ mr->readonly = true;
3750
/* This will assert if owner is neither NULL nor a DeviceState.
3751
* We only want the owner here for the purposes of defining a
3752
* unique name for migration. TODO: Ideally we should implement