We could simply convert these to use memory_region_init_ram but that would be a migration compatibility break so preserve current behaviour for now and use memory_region_init_ram_flags_nomigrate instead.
Signed-off-by: BALATON Zoltan <[email protected]> --- hw/display/tcx.c | 5 +++-- hw/sparc/sun4m.c | 15 +++++++++------ hw/sparc64/sun4u.c | 9 +++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 87fe7216ba..d6be297828 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -817,8 +817,9 @@ static void tcx_realizefn(DeviceState *dev, Error **errp) uint8_t *vram_base; char *fcode_filename; - memory_region_init_ram_nomigrate(&s->vram_mem, OBJECT(s), "tcx.vram", - s->vram_size * (1 + 4 + 4), &error_fatal); + memory_region_init_ram_flags_nomigrate(&s->vram_mem, OBJECT(s), "tcx.vram", + s->vram_size * (1 + 4 + 4), 0, + &error_fatal); vmstate_register_ram_global(&s->vram_mem); memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA); vram_base = memory_region_get_ram_ptr(&s->vram_mem); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 0c0d658d30..66a21ae86c 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -587,8 +587,10 @@ static void idreg_realize(DeviceState *ds, Error **errp) IDRegState *s = MACIO_ID_REGISTER(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds); - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.idreg", - sizeof(idreg_data), errp)) { + if (!memory_region_init_ram_flags_nomigrate(&s->mem, OBJECT(ds), + "sun4m.idreg", + sizeof(idreg_data), + 0, errp)) { return; } @@ -638,8 +640,8 @@ static void afx_realize(DeviceState *ds, Error **errp) AFXState *s = TCX_AFX(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds); - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx", - 4, errp)) { + if (!memory_region_init_ram_flags_nomigrate(&s->mem, OBJECT(ds), + "sun4m.afx", 4, 0, errp)) { return; } @@ -719,8 +721,9 @@ static void prom_realize(DeviceState *ds, Error **errp) PROMState *s = OPENPROM(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds); - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.prom", - PROM_SIZE_MAX, errp)) { + if (!memory_region_init_ram_flags_nomigrate(&s->prom, OBJECT(ds), + "sun4m.prom", PROM_SIZE_MAX, 0, + errp)) { return; } diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 5d7787fc1a..0da0eef74c 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -455,8 +455,9 @@ static void prom_realize(DeviceState *ds, Error **errp) PROMState *s = OPENPROM(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds); - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.prom", - PROM_SIZE_MAX, errp)) { + if (!memory_region_init_ram_flags_nomigrate(&s->prom, OBJECT(ds), + "sun4u.prom", PROM_SIZE_MAX, 0, + errp)) { return; } @@ -498,8 +499,8 @@ static void ram_realize(DeviceState *dev, Error **errp) RamDevice *d = SUN4U_RAM(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); - memory_region_init_ram_nomigrate(&d->ram, OBJECT(d), "sun4u.ram", d->size, - &error_fatal); + memory_region_init_ram_flags_nomigrate(&d->ram, OBJECT(d), "sun4u.ram", + d->size, 0, &error_fatal); vmstate_register_ram_global(&d->ram); sysbus_init_mmio(sbd, &d->ram); } -- 2.41.3
