@samitouri / QOSamiQemu / commits / 653c4fa5b0

hw/display/{cg3.tcx}: Do not use memory_region_init_rom_nomigrate()

Use memory_region_init_rom() instead which is what other devices do. This breaks migration but these devices are only used by sparc Sun machines which have no migration compatibility guarantee. 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/819df754e359b024bc9bf8f971ecd26816552559.1772924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu <peterx@redhat.com>

BALATON Zoltan committed Mar 8, 2026 at 00:05 UTC 653c4fa5b0bb74a6b779ff81cc157dba0265f923
2 files changed +4 -6
hw/display/cg3.c
+2 -3
@@ -282,8 +282,8 @@ static void cg3_initfn(Object *obj)
282 SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
283 CG3State *s = CG3(obj);
284
285 - memory_region_init_rom_nomigrate(&s->rom, obj, "cg3.prom",
286 - FCODE_MAX_ROM_SIZE, &error_fatal);
285 + memory_region_init_rom(&s->rom, obj, "cg3.prom", FCODE_MAX_ROM_SIZE,
286 + &error_fatal);
287 sysbus_init_mmio(sbd, &s->rom);
288
289 memory_region_init_io(&s->reg, obj, &cg3_reg_ops, s, "cg3.reg",
@@ -299,7 +299,6 @@ static void cg3_realizefn(DeviceState *dev, Error **errp)
299 char *fcode_filename;
300
301 /* FCode ROM */
302 - vmstate_register_ram_global(&s->rom);
302 fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, CG3_ROM_FILE);
303 if (fcode_filename) {
304 ret = load_image_mr(fcode_filename, &s->rom);
hw/display/tcx.c
+2 -3
@@ -756,8 +756,8 @@ static void tcx_initfn(Object *obj)
756 SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
757 TCXState *s = TCX(obj);
758
759 - memory_region_init_rom_nomigrate(&s->rom, obj, "tcx.prom",
760 - FCODE_MAX_ROM_SIZE, &error_fatal);
759 + memory_region_init_rom(&s->rom, obj, "tcx.prom", FCODE_MAX_ROM_SIZE,
760 + &error_fatal);
761 sysbus_init_mmio(sbd, &s->rom);
762
763 /* 2/STIP : Stippler */
@@ -822,7 +822,6 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
822 vram_base = memory_region_get_ram_ptr(&s->vram_mem);
823
824 /* 10/ROM : FCode ROM */
825 - vmstate_register_ram_global(&s->rom);
825 fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE);
826 if (fcode_filename) {
827 ret = load_image_mr(fcode_filename, &s->rom);