mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
memory: Rename memory_region_init_ram() to memory_region_init_ram_nomigrate()
Rename memory_region_init_ram() to memory_region_init_ram_nomigrate(). This leaves the way clear for us to provide a memory_region_init_ram() which does handle migration. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1499438577-7674-4-git-send-email-peter.maydell@linaro.org
This commit is contained in:
parent
a5c0234bb2
commit
1cfe48c1ce
72 changed files with 121 additions and 120 deletions
|
@ -159,7 +159,7 @@ static void leon3_generic_hw_init(MachineState *machine)
|
|||
|
||||
/* Allocate BIOS */
|
||||
prom_size = 8 * 1024 * 1024; /* 8Mb */
|
||||
memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size, &error_fatal);
|
||||
memory_region_init_ram_nomigrate(prom, NULL, "Leon3.bios", prom_size, &error_fatal);
|
||||
vmstate_register_ram_global(prom);
|
||||
memory_region_set_readonly(prom, true);
|
||||
memory_region_add_subregion(address_space_mem, 0x00000000, prom);
|
||||
|
|
|
@ -590,7 +590,7 @@ static void idreg_init1(Object *obj)
|
|||
IDRegState *s = MACIO_ID_REGISTER(obj);
|
||||
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
|
||||
|
||||
memory_region_init_ram(&s->mem, obj,
|
||||
memory_region_init_ram_nomigrate(&s->mem, obj,
|
||||
"sun4m.idreg", sizeof(idreg_data), &error_fatal);
|
||||
vmstate_register_ram_global(&s->mem);
|
||||
memory_region_set_readonly(&s->mem, true);
|
||||
|
@ -631,7 +631,7 @@ static void afx_init1(Object *obj)
|
|||
AFXState *s = TCX_AFX(obj);
|
||||
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
|
||||
|
||||
memory_region_init_ram(&s->mem, obj, "sun4m.afx", 4, &error_fatal);
|
||||
memory_region_init_ram_nomigrate(&s->mem, obj, "sun4m.afx", 4, &error_fatal);
|
||||
vmstate_register_ram_global(&s->mem);
|
||||
sysbus_init_mmio(dev, &s->mem);
|
||||
}
|
||||
|
@ -698,7 +698,7 @@ static void prom_init1(Object *obj)
|
|||
PROMState *s = OPENPROM(obj);
|
||||
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
|
||||
|
||||
memory_region_init_ram(&s->prom, obj, "sun4m.prom", PROM_SIZE_MAX,
|
||||
memory_region_init_ram_nomigrate(&s->prom, obj, "sun4m.prom", PROM_SIZE_MAX,
|
||||
&error_fatal);
|
||||
vmstate_register_ram_global(&s->prom);
|
||||
memory_region_set_readonly(&s->prom, true);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue