@samitouri / QOSamiQemu / commits / 945f3573dd

sun4m,sun4u,tcx: Do not use memory_region_init_ram_nomigrate()

Convert to use memory_region_init_{ram,rom} instead. This breaks migration but these machines have no migration compatibility guarantee and this removes most remaining usages of this nomigrate variant. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> Link: https://lore.kernel.org/r/1d0f04534af14598f5c6b8c6922e3f10d8bb18cf.1772924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu <peterx@redhat.com>

BALATON Zoltan committed Mar 8, 2026 at 00:06 UTC 945f3573dd208f2993aa6378b30202cef0dbca8d
3 files changed +9 -23
hw/display/tcx.c
+1 -2
@@ -815,9 +815,8 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
815 uint8_t *vram_base;
816 char *fcode_filename;
817
818 - memory_region_init_ram_nomigrate(&s->vram_mem, OBJECT(s), "tcx.vram",
818 + memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",
819 s->vram_size * (1 + 4 + 4), &error_fatal);
820 - vmstate_register_ram_global(&s->vram_mem);
820 memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA);
821 vram_base = memory_region_get_ram_ptr(&s->vram_mem);
822
hw/sparc/sun4m.c
+5 -14
@@ -587,13 +587,10 @@ static void idreg_realize(DeviceState *ds, Error **errp)
587 IDRegState *s = MACIO_ID_REGISTER(ds);
588 SysBusDevice *dev = SYS_BUS_DEVICE(ds);
589
590 - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.idreg",
591 - sizeof(idreg_data), errp)) {
590 + if (!memory_region_init_rom(&s->mem, OBJECT(ds), "sun4m.idreg",
591 + sizeof(idreg_data), errp)) {
592 return;
593 }
594 -
595 - vmstate_register_ram_global(&s->mem);
596 - memory_region_set_readonly(&s->mem, true);
594 sysbus_init_mmio(dev, &s->mem);
595 }
596
@@ -638,12 +635,9 @@ static void afx_realize(DeviceState *ds, Error **errp)
635 AFXState *s = TCX_AFX(ds);
636 SysBusDevice *dev = SYS_BUS_DEVICE(ds);
637
641 - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx",
642 - 4, errp)) {
638 + if (!memory_region_init_ram(&s->mem, OBJECT(ds), "sun4m.afx", 4, errp)) {
639 return;
640 }
645 -
646 - vmstate_register_ram_global(&s->mem);
641 sysbus_init_mmio(dev, &s->mem);
642 }
643
@@ -719,13 +713,10 @@ static void prom_realize(DeviceState *ds, Error **errp)
713 PROMState *s = OPENPROM(ds);
714 SysBusDevice *dev = SYS_BUS_DEVICE(ds);
715
722 - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.prom",
723 - PROM_SIZE_MAX, errp)) {
716 + if (!memory_region_init_rom(&s->prom, OBJECT(ds), "sun4m.prom",
717 + PROM_SIZE_MAX, errp)) {
718 return;
719 }
726 -
727 - vmstate_register_ram_global(&s->prom);
728 - memory_region_set_readonly(&s->prom, true);
720 sysbus_init_mmio(dev, &s->prom);
721 }
722
hw/sparc64/sun4u.c
+3 -7
@@ -455,13 +455,10 @@ static void prom_realize(DeviceState *ds, Error **errp)
455 PROMState *s = OPENPROM(ds);
456 SysBusDevice *dev = SYS_BUS_DEVICE(ds);
457
458 - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.prom",
459 - PROM_SIZE_MAX, errp)) {
458 + if (!memory_region_init_rom(&s->prom, OBJECT(ds), "sun4u.prom",
459 + PROM_SIZE_MAX, errp)) {
460 return;
461 }
462 -
463 - vmstate_register_ram_global(&s->prom);
464 - memory_region_set_readonly(&s->prom, true);
462 sysbus_init_mmio(dev, &s->prom);
463 }
464
@@ -498,9 +495,8 @@ static void ram_realize(DeviceState *dev, Error **errp)
495 RamDevice *d = SUN4U_RAM(dev);
496 SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
497
501 - memory_region_init_ram_nomigrate(&d->ram, OBJECT(d), "sun4u.ram", d->size,
498 + memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size,
499 &error_fatal);
503 - vmstate_register_ram_global(&d->ram);
500 sysbus_init_mmio(sbd, &d->ram);
501 }
502